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

[Daniel Dunbar]

Author: ddunbar
Date: Tue Jul 20 21:23:54 2010
New Revision: 108982

URL: http://llvm.org/viewvc/llvm-project?rev=108982&view=rev
Log:
LNT/nt: Teach LNT to automatically set LLVM_RELEASE_IS_PLUS_ASSERTS based on the
inferred LLVM revision, to support testing older LLVM revs.

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=108982&r1=108981&r2=108982&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/nt.py (original)
+++ zorg/trunk/lnt/lnt/tests/nt.py Tue Jul 20 21:23:54 2010
@@ -18,6 +18,8 @@
     return datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')
 
 def run_test(nick_prefix, opts):
+    llvm_source_version = get_source_version(opts.llvm_src_root)
+
     # Compute TARGET_FLAGS.
     target_flags = []
 
@@ -137,6 +139,11 @@
     if cc_info.get('cc_name') in ('apple_clang', 'clang'):
         make_variables['CC_UNDER_TEST_IS_CLANG'] = '1'
 
+    # Set LLVM_RELEASE_IS_PLUS_ASSERTS when appropriate, to allow testing older
+    # LLVM source trees.
+    if llvm_source_version.isdigit() and int(llvm_source_version) < 107758:
+        make_variables['LLVM_RELEASE_IS_PLUS_ASSERTS'] = 1
+
     # Set ARCH appropriately, based on the inferred target.
     #
     # FIXME: We should probably be more strict about this.
@@ -411,7 +418,7 @@
 
     # 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)
+    run_info['llvm_revision'] = llvm_source_version
     run_info['test_suite_revision'] = get_source_version(opts.test_suite_root)
     run_info.update(public_make_variables)