[llvm-commits] [zorg] r150763 - /zorg/trunk/lnt/lnt/tests/compile.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Feb 16 16:55:22 2012
New Revision: 150763

URL: http://llvm.org/viewvc/llvm-project?rev=150763&view=rev
Log:
[lnt] lnt.tests.compile: Tweak the mangling of test names.

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

Modified: zorg/trunk/lnt/lnt/tests/compile.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/tests/compile.py?rev=150763&r1=150762&r2=150763&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/compile.py (original)
+++ zorg/trunk/lnt/lnt/tests/compile.py Thu Feb 16 16:55:22 2012
@@ -91,7 +91,7 @@
 def test_cc_command(base_name, run_info, variables, input, output, flags,
                     extra_flags, has_output=True, ignore_stderr=False,
                     can_memprof=True):
-    name = '%s.flags=%s' % (base_name,' '.join(flags),)
+    name = '%s/(%s)' % (base_name,' '.join(flags),)
     input = get_input_path(opts, input)
     output = get_output_path(output)
 
@@ -222,16 +222,16 @@
     # infrastructure would just handle this.
     all_tests.append(('pch-gen/Cocoa',
                       curry(test_compile, input='Cocoa_Prefix.h',
-                            output='Cocoa_Prefix.h.gch', pch_input=None, flags=f,
-                            stage='pch-gen')))
+                            output='Cocoa_Prefix.h.gch', pch_input=None,
+                            flags=f, stage='pch-gen')))
     for input,uses_pch,extra_flags in all_inputs:
-        name = os.path.dirname(input)
+        name = input
         output = os.path.splitext(os.path.basename(input))[0] + '.o'
         for stage in stages_to_test:
             pch_input = None
             if uses_pch:
                 pch_input = 'Cocoa_Prefix.h.gch'
-            all_tests.append(('compile/%s/%s' % (name.replace('.','_'), stage),
+            all_tests.append(('compile/%s/%s' % (name, stage),
                               curry(test_compile, input=input, output=output,
                                     pch_input=pch_input, flags=f, stage=stage,
                                     extra_flags=extra_flags)))