diff options
author | 2018-01-16 05:51:48 -0800 | |
---|---|---|
committer | 2018-01-16 05:53:08 -0800 | |
commit | 290970c1e0567f1ecd39a64cd6fd14324367126e (patch) | |
tree | a21da1374b7871e2178f4d060aaea7824d708424 | |
parent | 0350ad30e80d5a5eb33362e304be7e2235d05114 (diff) |
Automated rollback of commit dafe71390340224e06eab0ac7afcebb2f5219f5a.
*** Reason for rollback ***
Breaks Bazel CI (https://ci.bazel.build/job/bazel-tests/1722/)
*** Original change description ***
Report unsuccessful error code if bazel fetch fails in "keep going" mode.
Fixes #3234.
PiperOrigin-RevId: 182042503
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java | 28 | ||||
-rwxr-xr-x | src/test/shell/bazel/external_integration_test.sh | 16 |
2 files changed, 10 insertions, 34 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java b/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java index aa657dca6e..0c6ca842d4 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/commands/FetchCommand.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.pkgcache.PackageCacheOptions; import com.google.devtools.build.lib.query2.AbstractBlazeQueryEnvironment; import com.google.devtools.build.lib.query2.engine.QueryEnvironment.Setting; -import com.google.devtools.build.lib.query2.engine.QueryEvalResult; import com.google.devtools.build.lib.query2.engine.QueryException; import com.google.devtools.build.lib.query2.engine.QueryExpression; import com.google.devtools.build.lib.query2.engine.ThreadSafeOutputFormatterCallback; @@ -123,17 +122,13 @@ public final class FetchCommand implements BlazeCommand { env.getCommandId().toString())); // 2. Evaluate expression: - QueryEvalResult queryEvalResult = null; try { - queryEvalResult = - queryEnv.evaluateQuery( - expr, - new ThreadSafeOutputFormatterCallback<Target>() { - @Override - public void processOutput(Iterable<Target> partialResult) { - // Throw away the result. - } - }); + queryEnv.evaluateQuery(expr, new ThreadSafeOutputFormatterCallback<Target>() { + @Override + public void processOutput(Iterable<Target> partialResult) { + // Throw away the result. + } + }); } catch (InterruptedException e) { env.getReporter() .post( @@ -153,15 +148,12 @@ public final class FetchCommand implements BlazeCommand { throw new IllegalStateException(e); } - if (!queryEvalResult.getSuccess()) { - env.getReporter().handle(Event.progress("All external dependencies fetched successfully.")); - } - ExitCode exitCode = - queryEvalResult.getSuccess() ? ExitCode.SUCCESS : ExitCode.COMMAND_LINE_ERROR; + env.getReporter().handle( + Event.progress("All external dependencies fetched successfully.")); env.getReporter() .post( new NoBuildRequestFinishedEvent( - exitCode, env.getRuntime().getClock().currentTimeMillis())); - return exitCode; + ExitCode.SUCCESS, env.getRuntime().getClock().currentTimeMillis())); + return ExitCode.SUCCESS; } } diff --git a/src/test/shell/bazel/external_integration_test.sh b/src/test/shell/bazel/external_integration_test.sh index 83af8fe41f..a899c1183d 100755 --- a/src/test/shell/bazel/external_integration_test.sh +++ b/src/test/shell/bazel/external_integration_test.sh @@ -948,20 +948,4 @@ EOF || fail 'Expected @ext//:foo and //:foo not to conflict' } -function test_failing_fetch_with_keep_going() { - touch WORKSPACE - cat > BUILD <<'EOF' -package(default_visibility = ["//visibility:public"]) - -cc_binary( - name = "hello-world", - srcs = ["hello-world.cc"], - deps = ["@fake//:fake"], -) -EOF - touch hello-world.cc - - bazel fetch --keep_going //... >& $TEST_log && fail "Expected to fail" || true -} - run_suite "external tests" |