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

[Daniel Dunbar]

Author: ddunbar
Date: Tue Jun 15 00:34:25 2010
New Revision: 105989

URL: http://llvm.org/viewvc/llvm-project?rev=105989&view=rev
Log:
LNT/nt: Add --no-machdep-info, which avoids putting stuff like the hostname in
the machine info. Useful when wanting to report results from a group of machines
and have the results shared.

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=105989&r1=105988&r2=105989&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/nt.py (original)
+++ zorg/trunk/lnt/lnt/tests/nt.py Tue Jun 15 00:34:25 2010
@@ -346,27 +346,33 @@
 
     # Collect the machine and run info.
     #
-    # FIXME: Support no-machdep-info.
-    #
     # FIXME: Import full range of data that the Clang tests are using?
     machine_info = {}
-    machine_info['uname'] = capture(["uname","-a"],
-                                    include_stderr=True).strip()
     machine_info['hardware'] = capture(["uname","-m"],
                                        include_stderr=True).strip()
     machine_info['os'] = capture(["uname","-sr"], include_stderr=True).strip()
-    machine_info['name'] = capture(["uname","-n"], include_stderr=True).strip()
     if opts.cc_reference is not None:
         machine_info['gcc_version'] = capture(
             [opts.cc_reference, '--version'],
             include_stderr=True).split('\n')[0]
-    machine = lnt.testing.Machine(nick, machine_info)
 
     # FIXME: We aren't getting the LLCBETA options.
     run_info = {}
     run_info['tag'] = test_namespace
     run_info.update(cc_info)
 
+    # Add machine dependent info.
+    if opts.use_machdep_info:
+        machdep_info = machine_info
+    else:
+        machdep_info = run_info
+
+    machdep_info['uname'] = capture(["uname","-a"], include_stderr=True).strip()
+    machdep_info['name'] = capture(["uname","-n"], include_stderr=True).strip()
+
+    # Create the machine entry.
+    machine = lnt.testing.Machine(nick, machine_info)
+
     # FIXME: Hack, use better method of getting versions. Ideally, from binaries
     # so we are more likely to be accurate.
     run_info['llvm_revision'] = get_source_version(opts.llvm_src_root)
@@ -599,7 +605,11 @@
         group.add_option("", "--no-auto-name", dest="auto_name",
                          help="Don't automatically derive submission name",
                          action="store_false", default=True)
-        parser.add_option("", "--run-order", dest="run_order", metavar="STR",
+        group.add_option("", "--no-machdep-info", dest="use_machdep_info",
+                         help=("Don't put machine (instance) dependent  "
+                               "variables with machine info"),
+                         action="store_false", default=True)
+        group.add_option("", "--run-order", dest="run_order", metavar="STR",
                           help="String to use to identify and order this run",
                           action="store", type=str, default=None)
         parser.add_option_group(group)