commit 233b72dd0607bafcf7f883504d436f0d98389c37
author lpino <lpino@google.com> Wed Jul 05 11:08:40 2017 -0400
committer John Cater <jcater@google.com> Wed Jul 05 13:10:50 2017 -0400
tree 6c97893381ed155ac2528c15964a6cf1841fbf07
parent ea6d06f55e0e2b3ef40ef393993bd83062e73eb7

Open source {workspace_layout,startup_options,option_processor}_test.

Additionally rewrite the option_processor_test to make it more flexible.

PiperOrigin-RevId: 160958736

src/main/cpp/option_processor.h

diff --git a/src/main/cpp/option_processor.h b/src/main/cpp/option_processor.h
index 094c3a3..af32dca 100644
--- a/src/main/cpp/option_processor.h
+++ b/src/main/cpp/option_processor.h
@@ -99,6 +99,9 @@
   // executed in.
   void GetCommandArguments(std::vector<std::string>* result) const;
 
+  // Gets the arguments explicitly provided by the user's command line.
+  std::vector<std::string> GetExplicitCommandArguments() const;
+
   StartupOptions* GetParsedStartupOptions() const;
 
   virtual blaze_exit_code::ExitCode FindUserBlazerc(
@@ -156,9 +159,14 @@
   unsigned int startup_args_;
   // The command found in args, this field is initialized by ParseOptions.
   std::string command_;
+  // The list of command options. This is put together from the default
+  // options specified in the bazelrc file(s), the command line, and various
+  // bits and pieces of information about the environment the bazel binary is
+  // executed in. This field is initialized by ParseOptions.
+  std::vector<std::string> command_arguments_;
   // The list of command options found in args, this field is initialized by
   // ParseOptions.
-  std::vector<std::string> command_arguments_;
+  std::vector<std::string> explicit_command_arguments_;
   // Whether ParseOptions has been called.
   bool initialized_;
   const WorkspaceLayout* workspace_layout_;