diff options
| author |  dmarting <dmarting@google.com> | 2017-11-12 12:09:45 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-12 12:11:48 -0800 |
| commit | 5de42397910471de67ed662b5c2084cfdc60b948 (patch) | |
| tree | 6677522da1cf6adfe60f77c0ff56582ba6799767 | |
| parent | 6b1b8a9dbd6e4796d5777d676050d45305ec163e (diff) | |
Test for embedded tools: do not include tools from @bazel_tools
Those tools are dependent on the host bazel (the one used for running the test) and that caused the test to be broken by the nightly.
PiperOrigin-RevId: 175462157
| -rwxr-xr-x | src/test/shell/bazel/embedded_tools_deps_test.sh | 9 | ||||
| -rw-r--r-- | src/test/shell/bazel/testdata/embedded_tools_srcs_deps | 16 |
2 files changed, 7 insertions, 18 deletions
diff --git a/src/test/shell/bazel/embedded_tools_deps_test.sh b/src/test/shell/bazel/embedded_tools_deps_test.sh index 120a1ea0b2..f609af82ca 100755 --- a/src/test/shell/bazel/embedded_tools_deps_test.sh +++ b/src/test/shell/bazel/embedded_tools_deps_test.sh @@ -36,8 +36,13 @@ if [ "${PLATFORM-}" != "darwin" ] && [ "${PLATFORM-}" != "linux" ]; then fi # Load the dependencies of //src:embedded_tools_srcs in the current workspace -# using the output of genquery //src/test/shell/bazel:embedded_tools_deps. -current_deps=${TEST_SRCDIR}/io_bazel/src/test/shell/bazel/embedded_tools_deps +# using the output of genquery //src/test/shell/bazel:embedded_tools_deps +# and removing everything under @bazel_tools because the exact contents of the +# latter depends on the bazel binary used to run the test. +current_deps="${TEST_TMPDIR}/current_deps" +grep -v "^@bazel_tools//" \ + "${TEST_SRCDIR}/io_bazel/src/test/shell/bazel/embedded_tools_deps" \ + >"${current_deps}" # Load the current allowed dependencies of //src:embedded_tools_srcs allowed_deps=${testdata_path}/embedded_tools_srcs_deps diff --git a/src/test/shell/bazel/testdata/embedded_tools_srcs_deps b/src/test/shell/bazel/testdata/embedded_tools_srcs_deps index ed480456a5..277d524408 100644 --- a/src/test/shell/bazel/testdata/embedded_tools_srcs_deps +++ b/src/test/shell/bazel/testdata/embedded_tools_srcs_deps @@ -3,20 +3,6 @@ @com_google_protobuf//:protobuf @com_google_protobuf//:protobuf_lite @com_google_protobuf//:js_embed -@bazel_tools//src/tools/launcher:launcher -@bazel_tools//src/tools/launcher:python_launcher -@bazel_tools//src/tools/launcher:java_launcher -@bazel_tools//src/tools/launcher:bash_launcher -@bazel_tools//src/tools/launcher:launcher_base -@bazel_tools//src/tools/launcher/util:data_parser -@bazel_tools//src/tools/launcher/util:util -@bazel_tools//src/main/cpp/util:file -@bazel_tools//src/main/native/windows:lib-file -@bazel_tools//src/main/native/windows:lib-util -@bazel_tools//src/main/cpp/util:strings -@bazel_tools//src/main/cpp/util:errors -@bazel_tools//src/main/cpp/util:port -@bazel_tools//src/main/cpp/util:blaze_exit_code //third_party/ijar:zipper //third_party/ijar:ijar //third_party/ijar:zip @@ -39,7 +25,6 @@ //src/tools/launcher/util:data_parser //src/tools/launcher/util:util //src/main/native/windows:windows_jni.dll -@bazel_tools//tools/cpp:malloc //src/main/cpp/util:util //src/main/cpp/util:numbers //src/main/cpp/util:md5 @@ -50,4 +35,3 @@ //src/main/cpp/util:errors //src/main/cpp/util:port //src/main/cpp/util:blaze_exit_code -@bazel_tools//tools/cpp:stl |