Fix SettingsCommandTestCase.test_set_error_output_path

[vharron]

Summary

target.error-path (and output-path) were getting resolved on the
local file system, which doesn't make any sense for remote targets

So this patch prevents file paths from being resolved on the host
system.

[vharron]

Committed revision 229763.

[clayborg]

Looks good

include/lldb/Interpreter/OptionValueFileSpec.h

 #include "lldb/Host/FileSpec.h"
 #include "lldb/Interpreter/OptionValue.h"
 
 namespace lldb_private {
 
 class OptionValueFileSpec : public OptionValue
 {
 public:
-    OptionValueFileSpec ();
+    OptionValueFileSpec (bool resolve = true);
     
-    OptionValueFileSpec (const FileSpec &value);
+    OptionValueFileSpec (const FileSpec &value,
+                         bool resolve = true);
     
     OptionValueFileSpec (const FileSpec &current_value, 
-                         const FileSpec &default_value);
+                         const FileSpec &default_value,
+                         bool resolve = true);
     
     virtual 
     ~OptionValueFileSpec()
     {
     }
     
     //---------------------------------------------------------------------
     // Virtual subclass pure virtual overrides
SetCompletionMask (uint32_t mask)
         m_completion_mask = mask;
     }
 
 protected:
     FileSpec m_current_value;
     FileSpec m_default_value;
     lldb::DataBufferSP m_data_sp;
     uint32_t m_completion_mask;
+    bool m_resolve;
 };
 
 } // namespace lldb_private
 
 #endif  // liblldb_OptionValueFileSpec_h_

source/Interpreter/OptionValueFileSpec.cpp

 #include "lldb/DataFormatters/FormatManager.h"
 #include "lldb/Interpreter/Args.h"
 #include "lldb/Interpreter/CommandCompletions.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
 
-OptionValueFileSpec::OptionValueFileSpec () :
+OptionValueFileSpec::OptionValueFileSpec (bool resolve) :
     OptionValue(),
     m_current_value (),
     m_default_value (),
     m_data_sp(),
-    m_completion_mask (CommandCompletions::eDiskFileCompletion)
+    m_completion_mask (CommandCompletions::eDiskFileCompletion),
+    m_resolve (resolve)
 {
 }
 
-OptionValueFileSpec::OptionValueFileSpec (const FileSpec &value) :
+OptionValueFileSpec::OptionValueFileSpec (const FileSpec &value,
+                                          bool resolve) :
     OptionValue(),
     m_current_value (value),
     m_default_value (value),
     m_data_sp(),
-    m_completion_mask (CommandCompletions::eDiskFileCompletion)
+    m_completion_mask (CommandCompletions::eDiskFileCompletion),
+    m_resolve (resolve)
 {
 }
 
 OptionValueFileSpec::OptionValueFileSpec (const FileSpec &current_value,
-                                          const FileSpec &default_value) :
+                                          const FileSpec &default_value,
+                                          bool resolve) :
     OptionValue(),
     m_current_value (current_value),
     m_default_value (default_value),
     m_data_sp(),
-    m_completion_mask (CommandCompletions::eDiskFileCompletion)
+    m_completion_mask (CommandCompletions::eDiskFileCompletion),
+    m_resolve (resolve)
 {
 }
 
 void
 OptionValueFileSpec::DumpValue (const ExecutionContext *exe_ctx, Stream &strm, uint32_t dump_mask)
 {
     if (dump_mask & eDumpOptionType)
         strm.Printf ("(%s)", GetTypeAsCString ());
case eVarSetOperationAssign:
             auto prefix_chars_to_trim = filepath.find_first_not_of ("\"' \t");
             if (prefix_chars_to_trim != std::string::npos && prefix_chars_to_trim > 0)
                 filepath.erase(0, prefix_chars_to_trim);
             auto suffix_chars_to_trim = filepath.find_last_not_of ("\"' \t");
             if (suffix_chars_to_trim != std::string::npos && suffix_chars_to_trim < filepath.size())
                 filepath.erase (suffix_chars_to_trim + 1);
 
             m_value_was_set = true;
-            m_current_value.SetFile(filepath.c_str(), true);
+            m_current_value.SetFile(filepath.c_str(), m_resolve);
             m_data_sp.reset();
             NotifyValueChanged();
         }
         else
         {
             error.SetErrorString("invalid value string");
         }
         break;

source/Interpreter/Property.cpp

switch (definition.type)
                     // the boolean that says that the value has been set.
                     enum_value->Clear();
                 }
             }
         }
             break;
             
         case OptionValue::eTypeFileSpec:
+        {
             // "definition.default_uint_value" represents if the "definition.default_cstr_value" should
             // be resolved or not
-            m_value_sp.reset (new OptionValueFileSpec(FileSpec(definition.default_cstr_value, definition.default_uint_value != 0)));
+            const bool resolve = definition.default_uint_value != 0;
+            m_value_sp.reset (new OptionValueFileSpec(FileSpec(definition.default_cstr_value, resolve), resolve));
             break;
+        }
             
         case OptionValue::eTypeFileSpecList:
             // "definition.default_uint_value" is not used for a OptionValue::eTypeFileSpecList
             m_value_sp.reset (new OptionValueFileSpecList());
             break;
             
         case OptionValue::eTypeFormat:
             // "definition.default_uint_value" is the default format enumeration value if

test/settings/TestSettings.py

def test_set_error_output_path(self):
         # And add hooks to restore the original settings during tearDown().
         self.addTearDownHook(
             lambda: self.runCmd("settings clear target.output-path"))
         self.addTearDownHook(
             lambda: self.runCmd("settings clear target.error-path"))
 
         self.expect("settings show target.error-path",
                     SETTING_MSG("target.error-path"),
-                    substrs = ['target.error-path (file) = ', 'stderr.txt"'])
+                    substrs = ['target.error-path (file) = "stderr.txt"'])
 
         self.expect("settings show target.output-path",
                     SETTING_MSG("target.output-path"),
-                    substrs = ['target.output-path (file) = ', 'stdout.txt"'])
+                    substrs = ['target.output-path (file) = "stdout.txt"'])
 
         self.runCmd("run", RUN_SUCCEEDED)
 
+        if lldb.remote_platform:
+            self.runCmd('platform get-file "stderr.txt" "stderr.txt"')
+            self.runCmd('platform get-file "stdout.txt" "stdout.txt"')
+
+
         # The 'stderr.txt' file should now exist.
         self.assertTrue(os.path.isfile("stderr.txt"),
                         "'stderr.txt' exists due to target.error-path.")
 
         # Read the output file produced by running the program.
         with open('stderr.txt', 'r') as f:
             output = f.read()