Fix TestQuoting on remote targets.

[chaoren]

Summary

Needed to transfer stdout.txt to host before reading.

[ovyalov]

Please see my comments.

test/settings/quoting/TestQuoting.py

71 ↗

(On Diff #21070)

No need for semicolon

74 ↗

(On Diff #21070)

Does it work in case of local run? It seems it might read and write data from/into the same file..

[chaoren]

test/settings/quoting/TestQuoting.py

74 ↗

(On Diff #21070)

I had that concern too, but it works fine on local.

[ovyalov]

test/settings/quoting/TestQuoting.py

74 ↗

(On Diff #21070)

I remember I had such issue with platform.Put when source and destination were in the same directory.
To be safe, please give them different names stdout-(local|remote).txt and check on OSX as well.

[chaoren]

test/settings/quoting/TestQuoting.py

74 ↗

(On Diff #21070)

I guess we could just check if the file already exists, and if it does, assume local, and skip the Get(). Platform cannot tell if we're local, right? Also, platform doesn't provide any functionality to delete remote files, right?

[chaoren]

Disable on local.

[tberghammer]

test/settings/quoting/TestQuoting.py

71 ↗

(On Diff #21079)

I think you can check if we run against a remote platform with this condition:

if lldb.remote_platform:
    # Remote
else:
    # Local

74 ↗

(On Diff #21070)

Platform can remove a file (with the Unlink command) but it is not exposed to the Python interface. If you need it you can expose it easily.

[clayborg]

Please use the "if lldb.remote_platform:" test when doing any remote fetching as tberghammer suggested.

[chaoren]

Using lldb.remote_platform to check if file transfer is necessary.

[clayborg]

Check my inline comments.

test/settings/quoting/TestQuoting.py

72 ↗

(On Diff #21118)

Shouldn't this be set to "False" to not resolve the remote copy? Isn't "src_file_spec" the remote path?

73 ↗

(On Diff #21118)

Isn't this the local copy of the file and so it should be resolved?

[chaoren]

Accidentally resolved remote file instead of local.

[vharron]

lldb/trunk/test/settings/quoting/TestQuoting.py

71

In other tests, I use the terms "local" and "remote" instead of "src" and "dst"

lldb/trunk/test/settings/quoting/TestQuoting.py

def do_test_args(self, args_in, args_out):
         to stdout. Compare the stdout with args_out."""
         self.buildDefault()
 
         exe = os.path.join(os.getcwd(), "a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         self.runCmd("process launch -o stdout.txt -- " + args_in)
 
+        if lldb.remote_platform:
+            src_file_spec = lldb.SBFileSpec('stdout.txt', False)
+            dst_file_spec = lldb.SBFileSpec('stdout.txt', True)
+            lldb.remote_platform.Get(src_file_spec, dst_file_spec);
+
         with open('stdout.txt', 'r') as f:
             output = f.read()
 
         self.RemoveTempFile("stdout.txt")
 
         self.assertEqual(output, args_out)
 
 if __name__ == '__main__':
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
     unittest2.main()