[llvm-commits] [zorg] r141399 - /zorg/trunk/lnt/lnt/tests/nt.py
Daniel Dunbar
daniel at zuster.org
Fri Oct 7 12:54:59 PDT 2011
Author: ddunbar
Date: Fri Oct 7 14:54:59 2011
New Revision: 141399
URL: http://llvm.org/viewvc/llvm-project?rev=141399&view=rev
Log:
LNT/nt: Factor out compute_run_make_variables().
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=141399&r1=141398&r2=141399&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/nt.py (original)
+++ zorg/trunk/lnt/lnt/tests/nt.py Fri Oct 7 14:54:59 2011
@@ -124,29 +124,8 @@
return test_namespace, test_samples
-def run_test(nick_prefix, opts, iteration):
- if opts.llvm_src_root:
- llvm_source_version = get_source_version(opts.llvm_src_root)
- else:
- llvm_source_version = None
-
- # Compute TARGET_FLAGS.
- target_flags = []
-
- # FIXME: Eliminate this blanket option.
- target_flags.extend(opts.cflags)
-
- # Pass flags to backend.
- for f in opts.mllvm:
- target_flags.extend(['-mllvm', f])
-
- if opts.arch is not None:
- target_flags.append('-arch')
- target_flags.append(opts.arch)
- if opts.isysroot is not None:
- target_flags.append('-isysroot')
- target_flags.append(opts.isysroot)
-
+def compute_run_make_variables(opts, llvm_source_version, target_flags,
+ cc_info):
# Set the make variables to use.
make_variables = {
'TARGET_CC' : opts.cc_reference,
@@ -259,10 +238,6 @@
make_variables['USE_REFERENCE_OUTPUT'] = '1'
make_variables['TEST'] = opts.test_style
- # Get compiler info.
- cc_info = lnt.testing.util.compilers.get_cc_info(opts.cc_under_test,
- target_flags)
-
# Set CC_UNDER_TEST_IS_CLANG when appropriate.
if cc_info.get('cc_name') in ('apple_clang', 'clang'):
make_variables['CC_UNDER_TEST_IS_CLANG'] = '1'
@@ -319,6 +294,40 @@
else:
warning("unable to infer ARCH, some tests may not run correctly!")
+ return make_variables
+
+def run_test(nick_prefix, opts, iteration):
+ if opts.llvm_src_root:
+ llvm_source_version = get_source_version(opts.llvm_src_root)
+ else:
+ llvm_source_version = None
+
+ # Compute TARGET_FLAGS.
+ target_flags = []
+
+ # FIXME: Eliminate this blanket option.
+ target_flags.extend(opts.cflags)
+
+ # Pass flags to backend.
+ for f in opts.mllvm:
+ target_flags.extend(['-mllvm', f])
+
+ if opts.arch is not None:
+ target_flags.append('-arch')
+ target_flags.append(opts.arch)
+ if opts.isysroot is not None:
+ target_flags.append('-isysroot')
+ target_flags.append(opts.isysroot)
+
+ # Get compiler info.
+ cc_info = lnt.testing.util.compilers.get_cc_info(opts.cc_under_test,
+ target_flags)
+ cc_target = cc_info.get('cc_target')
+
+ # Compute the make variables.
+ make_variables = compute_run_make_variables(opts, llvm_source_version,
+ target_flags, cc_info)
+
# Stash the variables we want to report.
public_make_variables = make_variables.copy()
More information about the llvm-commits
mailing list