diff options
Diffstat (limited to 'src/test/cpp/bazel_startup_options_test.cc')
| -rw-r--r-- | src/test/cpp/bazel_startup_options_test.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/test/cpp/bazel_startup_options_test.cc b/src/test/cpp/bazel_startup_options_test.cc index 4f0e460693..3e372e4a88 100644 --- a/src/test/cpp/bazel_startup_options_test.cc +++ b/src/test/cpp/bazel_startup_options_test.cc @@ -85,10 +85,13 @@ TEST_F(BazelStartupOptionsTest, ValidStartupFlags) { ExpectIsNullaryOption(options, "deep_execroot"); ExpectIsNullaryOption(options, "experimental_oom_more_eagerly"); ExpectIsNullaryOption(options, "fatal_event_bus_exceptions"); + ExpectIsNullaryOption(options, "home_rc"); ExpectIsNullaryOption(options, "host_jvm_debug"); ExpectIsNullaryOption(options, "ignore_all_rc_files"); ExpectIsNullaryOption(options, "master_bazelrc"); + ExpectIsNullaryOption(options, "system_rc"); ExpectIsNullaryOption(options, "watchfs"); + ExpectIsNullaryOption(options, "workspace_rc"); ExpectIsNullaryOption(options, "write_command_log"); ExpectIsUnaryOption(options, "bazelrc"); ExpectIsUnaryOption(options, "command_port"); @@ -128,28 +131,28 @@ TEST_F(BazelStartupOptionsTest, IgnoredBazelrcFlagWarnsWhenAfterIgnore) { "on.\n"); } -TEST_F(BazelStartupOptionsTest, IgnoredMasterBazelrcFlagWarns) { +TEST_F(BazelStartupOptionsTest, IgnoredWorkspaceRcFlagWarns) { ParseStartupOptionsAndExpectWarning( - startup_options_.get(), {"--master_bazelrc", "--ignore_all_rc_files"}, - "WARNING: Explicit value of --master_bazelrc is ignored, " + startup_options_.get(), {"--workspace_rc", "--ignore_all_rc_files"}, + "WARNING: Explicit value of --workspace_rc is ignored, " "since --ignore_all_rc_files is on.\n"); } -TEST_F(BazelStartupOptionsTest, IgnoredMasterBazelrcFlagWarnsAfterIgnore) { +TEST_F(BazelStartupOptionsTest, IgnoredWorkspaceRcFlagWarnsAfterIgnore) { ParseStartupOptionsAndExpectWarning( - startup_options_.get(), {"--ignore_all_rc_files", "--master_bazelrc"}, - "WARNING: Explicit value of --master_bazelrc is ignored, " + startup_options_.get(), {"--ignore_all_rc_files", "--workspace_rc"}, + "WARNING: Explicit value of --workspace_rc is ignored, " "since --ignore_all_rc_files is on.\n"); } TEST_F(BazelStartupOptionsTest, MultipleIgnoredRcFlagsWarnOnceEach) { ParseStartupOptionsAndExpectWarning( startup_options_.get(), - {"--master_bazelrc", "--bazelrc=somefile", "--ignore_all_rc_files", - "--bazelrc=thefinalfile", "--master_bazelrc"}, + {"--workspace_rc", "--bazelrc=somefile", "--ignore_all_rc_files", + "--bazelrc=thefinalfile", "--workspace_rc"}, "WARNING: Value of --bazelrc is ignored, " "since --ignore_all_rc_files is on.\n" - "WARNING: Explicit value of --master_bazelrc is ignored, " + "WARNING: Explicit value of --workspace_rc is ignored, " "since --ignore_all_rc_files is on.\n"); } |