diff options
| -rw-r--r-- | scripts/ci/bazel-tests-remote.json | 2 | ||||
| -rw-r--r-- | src/test/shell/integration/BUILD | 2 | ||||
| -rwxr-xr-x | src/test/shell/integration/progress_reporting_test.sh | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/scripts/ci/bazel-tests-remote.json b/scripts/ci/bazel-tests-remote.json index 00f376756f..6123068428 100644 --- a/scripts/ci/bazel-tests-remote.json +++ b/scripts/ci/bazel-tests-remote.json @@ -26,7 +26,7 @@ "--java_toolchain=@bazel_toolchains//configs/java/0.1.0/bazel_0.6.0:remote_toolchain" ], "tests": [ - "tests(//src/test/shell/integration/...) - //src/test/shell/integration:progress_reporting_test", + "//src/test/shell/integration/...", "//src/test/java/... - //src/test/java/com/google/devtools/build/android/..." ], "test_tag_filters": ["-slow"], diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD index 75471033f2..871060b964 100644 --- a/src/test/shell/integration/BUILD +++ b/src/test/shell/integration/BUILD @@ -16,7 +16,7 @@ filegroup( sh_test( name = "progress_reporting_test", - size = "medium", + size = "large", srcs = ["progress_reporting_test.sh"], data = [":test-deps"], shard_count = 8, diff --git a/src/test/shell/integration/progress_reporting_test.sh b/src/test/shell/integration/progress_reporting_test.sh index b42e28ec46..6027b5a406 100755 --- a/src/test/shell/integration/progress_reporting_test.sh +++ b/src/test/shell/integration/progress_reporting_test.sh @@ -273,7 +273,15 @@ genrule( ) EOF - bazel build -k -s "//${pkg}:"{top,longrun} --progress_report_interval=1 \ + # The whole test setup relies on bazel running the actions for + # :dep and :longrun in parallel. However, bazel normally analyzes + # the environment and bases the action scheduling on this; so we + # need to tell bazel to (maybe even contrafactually) believe that + # there are enough local resources for two genrules to run in parallel. + # Give enough head room so that the test won't break again if we tweak + # our assumptions about local resource usage. + bazel build -j 2 --local_resources=2048000,32,32 \ + -k -s "//${pkg}:"{top,longrun} --progress_report_interval=1 \ >& "$TEST_log" && fail "build succeeded" expect_log "\[3 / 4\] Still waiting for 1 job to complete:" expect_log "^ *Executing genrule //${pkg}:longrun" |