From 08c8aac68cb549a6e35e8a7f4686131d83ba30e4 Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 5 Nov 2015 16:14:14 +0000 Subject: Disable the Bazel/Skylark sandboxing test and fix erroneous 'return' stmt. -- MOS_MIGRATED_REVID=107140482 --- src/test/shell/bazel/bazel_sandboxing_test.sh | 2 +- src/test/shell/bazel/bazel_sandboxing_test_utils.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/test/shell/bazel/bazel_sandboxing_test.sh b/src/test/shell/bazel/bazel_sandboxing_test.sh index c1e3c86d8b..ffa20eec00 100755 --- a/src/test/shell/bazel/bazel_sandboxing_test.sh +++ b/src/test/shell/bazel/bazel_sandboxing_test.sh @@ -246,7 +246,7 @@ function test_sandbox_undeclared_deps_with_local_tag() { || fail "Genrule didn't produce output: examples/genrule:breaks1_works_with_local_tag" } -function test_sandbox_undeclared_deps_skylark() { +function DISABLED_test_sandbox_undeclared_deps_skylark() { bazel build --genrule_strategy=sandboxed \ examples/genrule:skylark_breaks1 \ && fail "Non-hermetic genrule succeeded: examples/genrule:skylark_breaks1" || true diff --git a/src/test/shell/bazel/bazel_sandboxing_test_utils.sh b/src/test/shell/bazel/bazel_sandboxing_test_utils.sh index e7efd51224..827dc35c3c 100755 --- a/src/test/shell/bazel/bazel_sandboxing_test_utils.sh +++ b/src/test/shell/bazel/bazel_sandboxing_test_utils.sh @@ -50,6 +50,6 @@ cc_test(name = "sandbox_enabled", srcs = ["test.c"], copts = ["-std=c99"]) EOF bazel test //test:sandbox_enabled || { echo "Sandboxing disabled, skipping..." - return false + return 1 } } -- cgit v1.2.3