[llvm-commits] [zorg] r114772 - /zorg/trunk/lnt/lnt/tests/nt.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Sep 24 18:19:43 2010
New Revision: 114772

URL: http://llvm.org/viewvc/llvm-project?rev=114772&view=rev
Log:
LNT/nt: When using a remote execution host, capture uname (and optionally sw_vers) from it.

Modified:
    zorg/trunk/lnt/lnt/tests/nt.py

Modified: zorg/trunk/lnt/lnt/tests/nt.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/tests/nt.py?rev=114772&r1=114771&r2=114772&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/nt.py (original)
+++ zorg/trunk/lnt/lnt/tests/nt.py Fri Sep 24 18:19:43 2010
@@ -445,6 +445,25 @@
     run_info['tag'] = test_namespace
     run_info.update(cc_info)
 
+    # Capture sw_vers if this looks like Darwin.
+    if 'Darwin' in machine_info['os']:
+        run_info['sw_vers'] = capture(['sw_vers'], include_stderr=True).strip()
+
+    # Query remote properties if in use.
+    if opts.remote:
+        remote_args = [opts.remote_client,
+                       "-l", opts.remote_user,
+                       "-p",  str(opts.remote_port),
+                       opts.remote_host]
+        print remote_args
+        run_info['remote_uname'] = capture(remote_args + ["uname", "-a"],
+                                           include_stderr=True).strip()
+
+        # Capture sw_vers if this looks like Darwin.
+        if 'Darwin' in run_info['remote_uname']:
+            run_info['remote_sw_vers'] = capture(remote_args + ["sw_vers"],
+                                                 include_stderr=True).strip()
+
     # Add machine dependent info.
     if opts.use_machdep_info:
         machdep_info = machine_info