commit 5305a36b93f2ad0a1b499bc916e6cf365676532c
author ccalvarin <ccalvarin@google.com> Fri Apr 20 13:56:55 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Apr 20 13:58:51 2018 -0700
tree fd59c966cda802c6f36831ee47f3317cbf0343f1
parent fc44daf3c4142a588c4a553c8abfd6f28bbaf4f3

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

src/test/cpp/option_processor_test.cc

diff --git a/src/test/cpp/option_processor_test.cc b/src/test/cpp/option_processor_test.cc
index 19c5d34..df48cce 100644
--- a/src/test/cpp/option_processor_test.cc
+++ b/src/test/cpp/option_processor_test.cc
@@ -14,6 +14,7 @@
 
 #include "src/main/cpp/option_processor.h"
 
+#include "src/main/cpp/bazel_startup_options.h"
 #include "src/main/cpp/blaze_util.h"
 #include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/option_processor-internal.h"
@@ -41,7 +42,7 @@
     option_processor_.reset(new OptionProcessor(
         workspace_layout_.get(),
         std::unique_ptr<StartupOptions>(
-            new StartupOptions(workspace_layout_.get()))));
+            new BazelStartupOptions(workspace_layout_.get()))));
   }
 
   void TearDown() override {