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

[Daniel Dunbar]

Author: ddunbar
Date: Fri Apr  1 11:01:57 2011
New Revision: 128714

URL: http://llvm.org/viewvc/llvm-project?rev=128714&view=rev
Log:
LNT/nt: Reject llc style options with --simple (they are unused).

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=128714&r1=128713&r2=128714&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/nt.py (original)
+++ zorg/trunk/lnt/lnt/tests/nt.py Fri Apr  1 11:01:57 2011
@@ -37,17 +37,6 @@
         target_flags.append('-isysroot')
         target_flags.append(opts.isysroot)
 
-    # Compute TARGET_LLCFLAGS.
-    target_llcflags = []
-    if opts.mcpu is not None:
-        target_llcflags.append('-mcpu')
-        target_llcflags.append(opts.mcpu)
-    if opts.relocation_model is not None:
-        target_llcflags.append('-relocation-model')
-        target_llcflags.append(opts.relocation_model)
-    if opts.disable_fp_elim:
-        target_llcflags.append('-disable-fp-elim')
-
     # Set the make variables to use.
     make_variables = {
         'TARGET_CC' : opts.cc_reference,
@@ -55,9 +44,22 @@
         'TARGET_LLVMGCC' : opts.cc_under_test,
         'TARGET_LLVMGXX' : opts.cxx_under_test,
         'TARGET_FLAGS' : ' '.join(target_flags),
-        'TARGET_LLCFLAGS' : ' '.join(target_llcflags),
         }
 
+    # Compute TARGET_LLCFLAGS, for non-TEST=simple runs.
+    if not opts.test_simple:
+        # Compute TARGET_LLCFLAGS.
+        target_llcflags = []
+        if opts.mcpu is not None:
+            target_llcflags.append('-mcpu')
+            target_llcflags.append(opts.mcpu)
+        if opts.relocation_model is not None:
+            target_llcflags.append('-relocation-model')
+            target_llcflags.append(opts.relocation_model)
+        if opts.disable_fp_elim:
+            target_llcflags.append('-disable-fp-elim')
+        make_variables['TARGET_LLCFLAGS'] = ' '.join(target_llcflags)
+            
     # Pick apart the build mode.
     build_mode = opts.build_mode
     if build_mode.startswith("Debug"):
@@ -778,6 +780,15 @@
                 parser.error('--cc-reference is unused with --simple')
             if opts.cxx_reference is not None:
                 parser.error('--cxx-reference is unused with --simple')
+            # TEST=simple doesn't use a llc options.
+            if opts.mcpu is not None:
+                parser.error('--mcpu is unused with --simple (use --cflag)')
+            if opts.relocation_model is not None:
+                parser.error('--relocation-model is unused with --simple '
+                             '(use --cflag)')
+            if opts.disable_fp_elim:
+                parser.error('--disable-fp-elim is unused with --simple '
+                             '(use --cflag)')
         else:
             if opts.without_llvm:
                 parser.error('--simple is required with --without-llvm')