diff options
| author |  ccalvarin <ccalvarin@google.com> | 2018-04-20 13:56:55 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-20 13:58:51 -0700 |
| commit | 5305a36b93f2ad0a1b499bc916e6cf365676532c (patch) | |
| tree | fd59c966cda802c6f36831ee47f3317cbf0343f1 /src/test/shell/integration/execution_phase_tests.sh | |
| parent | fc44daf3c4142a588c4a553c8abfd6f28bbaf4f3 (diff) | |
Remove overlap between the blazerc and bazelrc names.
Bazel now has its own subclass of StartupOptions to specify bazel-only options. This is needed for https://github.com/bazelbuild/bazel/issues/4502.
RELNOTES(INC): No longer accepts --blazerc or --[no]master_blazerc, accepts bazelrc name only.
PiperOrigin-RevId: 193718297
Diffstat (limited to 'src/test/shell/integration/execution_phase_tests.sh')
| -rwxr-xr-x | src/test/shell/integration/execution_phase_tests.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/test/shell/integration/execution_phase_tests.sh b/src/test/shell/integration/execution_phase_tests.sh index 21d6dc8da1..3905877196 100755 --- a/src/test/shell/integration/execution_phase_tests.sh +++ b/src/test/shell/integration/execution_phase_tests.sh @@ -211,18 +211,14 @@ function test_cache_computed_file_digests_ui() { function test_jobs_default_auto() { # The default flag value is only read if --jobs is not set explicitly. # Do not use a bazelrc here, this would break the test. - # TODO(b/65166983) this should be --bazelrc=/dev/null, since this is a bazel - # test and we want to encourage bazel-specific naming, but that would - # currently break the test because --bazelrc and --blazerc are treated - # separately. mkdir -p package || fail "mkdir failed" echo "cc_library(name = 'foo', srcs = ['foo.cc'])" >package/BUILD echo "int foo(void) { return 0; }" >package/foo.cc - local output_base="$(bazel --nomaster_bazelrc --blazerc=/dev/null info \ + local output_base="$(bazel --nomaster_bazelrc --bazelrc=/dev/null info \ output_base 2>/dev/null)" || fail "bazel info should work" local java_log="${output_base}/java.log" - bazel --nomaster_bazelrc --blazerc=/dev/null build package:foo \ + bazel --nomaster_bazelrc --bazelrc=/dev/null build package:foo \ >>"${TEST_log}" 2>&1 || fail "Should build" assert_last_log "BuildRequest" 'Flag "jobs" was set to "auto"' "${java_log}" \ |