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

[Bob Wilson]

Author: bwilson
Date: Thu Jul  8 11:03:08 2010
New Revision: 107876

URL: http://llvm.org/viewvc/llvm-project?rev=107876&view=rev
Log:
Fix setting of DISABLE_ASSERTIONS.  For some reason, our makefiles are
inconsistent and use DISABLE_ASSERTIONS instead of ENABLE_ASSERTIONS.

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=107876&r1=107875&r2=107876&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/nt.py (original)
+++ zorg/trunk/lnt/lnt/tests/nt.py Thu Jul  8 11:03:08 2010
@@ -66,7 +66,6 @@
     else:
         fatal('invalid build mode: %r' % opts.build_mode)
 
-    make_variables['DISABLE_ASSERTIONS'] = '1'
     while build_mode:
         for (name,key) in (('+Asserts', 'ENABLE_ASSERTIONS'),
                            ('+Checks', 'ENABLE_EXPENSIVE_CHECKS'),
@@ -80,6 +79,12 @@
         else:
             fatal('invalid build mode: %r' % opts.build_mode)
 
+    # Assertions are disabled by default.
+    if 'ENABLE_ASSERTIONS' in make_variables:
+        del make_variables['ENABLE_ASSERTIONS']
+    else:
+        make_variables['DISABLE_ASSERTIONS'] = '1'
+
     # Set the optimization level options.
     make_variables['OPTFLAGS'] = opts.optimize_option
     if opts.optimize_option == '-Os':