diff options
| author |  ruperts <ruperts@google.com> | 2017-11-29 19:24:22 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-29 19:25:47 -0800 |
| commit | 89ec374424a585c4923df942c848c6a88ddd9db7 (patch) | |
| tree | 5ed97a783db86993c7893cf28db5852469f59f1d /src | |
| parent | a5cac5d2c7e3f426d518ecd537d8988977695bf5 (diff) | |
Fix protoc_compiler variable in testenv.sh and add //third_party/protobuf:protoc dependency to process_wrapper_test.
RELNOTES: None.
PiperOrigin-RevId: 177399066
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/shell/integration/BUILD | 1 | ||||
| -rwxr-xr-x | src/test/shell/testenv.sh | 22 |
2 files changed, 3 insertions, 20 deletions
diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD index 271f584551..214d54799d 100644 --- a/src/test/shell/integration/BUILD +++ b/src/test/shell/integration/BUILD @@ -292,6 +292,7 @@ sh_test( ":spend_cpu_time", ":test-deps", "//src/main/protobuf:execution_statistics.proto", + "//third_party/protobuf:protoc", ], ) diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index 20f50948c9..b9d641fac8 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -148,26 +148,8 @@ if [ "${MACHINE_TYPE}" = 's390x' ]; then MACHINE_IS_Z='yes' fi -case "${PLATFORM}" in - darwin) - if [ "${MACHINE_IS_64BIT}" = 'yes' ]; then - protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/protoc-osx-x86_64.exe" - else - protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/protoc-osx-x86_32.exe" - fi - ;; - *) - if [ "${MACHINE_IS_64BIT}" = 'yes' ]; then - if [ "${MACHINE_IS_Z}" = 'yes' ]; then - protoc_compiler="${BAZEL_RUNFILES}//third_party/protobuf/protoc-linux-s390x_64.exe" - else - protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/protoc-linux-x86_64.exe" - fi - else - protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/protoc-linux-x86_32.exe" - fi - ;; -esac +# Requires //third_party/protobuf:protoc +protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/3.4.0/protoc" if [ -z ${RUNFILES_MANIFEST_ONLY+x} ]; then junit_jar="${BAZEL_RUNFILES}/third_party/junit/junit-*.jar" |