diff options
Diffstat (limited to 'src/test')
| -rwxr-xr-x | src/test/shell/bazel/bazel_example_test.sh | 8 | ||||
| -rwxr-xr-x | src/test/shell/bazel/test-setup.sh | 17 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/test/shell/bazel/bazel_example_test.sh b/src/test/shell/bazel/bazel_example_test.sh index 9908ebc6c9..b9d2aef276 100755 --- a/src/test/shell/bazel/bazel_example_test.sh +++ b/src/test/shell/bazel/bazel_example_test.sh @@ -168,12 +168,4 @@ function test_java_test_skylark() { assert_test_fails //${javatests}:fail } -function test_protobuf() { - setup_protoc_support - local jar=bazel-bin/examples/proto/libtest_proto.jar - assert_build_output $jar //examples/proto:test_proto - unzip -v $jar | grep -q 'KeyVal\.class' \ - || fail "Did not find KeyVal class in proto jar." -} - run_suite "examples" diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh index 2efe10b69b..8ed875b2cf 100755 --- a/src/test/shell/bazel/test-setup.sh +++ b/src/test/shell/bazel/test-setup.sh @@ -271,23 +271,6 @@ android_sdk_repository( EOF } -function setup_protoc_support() { - mkdir -p third_party/protobuf - [ -e third_party/protobuf/protoc ] \ - || ln -s ${protoc_compiler} third_party/protobuf/protoc - [ -e third_party/protobuf/protobuf-java.jar ] \ - || ln -s ${protoc_jar} third_party/protobuf/protobuf-java.jar - -cat <<EOF > third_party/BUILD -package(default_visibility = ["//visibility:public"]) -exports_files(["protoc"]) -java_import( - name = "protobuf", - jars = ["protobuf-java.jar"]) - -EOF -} - function setup_javatest_common() { # TODO(bazel-team): we should use remote repositories. mkdir -p third_party |