[llvm-commits] [zorg] r141464 - in /zorg/trunk/lnt: docs/tests.rst lnt/tests/nt.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Oct  7 20:01:28 2011
New Revision: 141464

URL: http://llvm.org/viewvc/llvm-project?rev=141464&view=rev
Log:
LNT/nt: Add a MODULENAME options variable, fix up the CC/CXX variables, and document some more.

Modified:
    zorg/trunk/lnt/docs/tests.rst
    zorg/trunk/lnt/lnt/tests/nt.py

Modified: zorg/trunk/lnt/docs/tests.rst
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/docs/tests.rst?rev=141464&r1=141463&r2=141464&view=diff
==============================================================================
--- zorg/trunk/lnt/docs/tests.rst (original)
+++ zorg/trunk/lnt/docs/tests.rst Fri Oct  7 20:01:28 2011
@@ -168,8 +168,20 @@
 execution, and the test should return the test results as a list of
 ``lnt.testing.TestSamples`` objects.
 
-The ``execute_test`` method is passed the following options which apply to how
-tests should be executed:
+The ``execute_test`` method is passed the following options describing
+information about the module itself:
+
+  * ``MODULENAME`` - The name of the module (primarily intended for use in
+    producing well structured test names).
+
+  * ``SRCROOT`` - The path to the modules source directory.
+
+  * ``OBJROOT`` - The path to a directory the module should use for temporary
+    output (build products). The directory is guaranteed to exist but is not
+    guaranteed to be clean.
+
+The method is passed the following options which apply to how tests should be
+executed:
 
   * ``THREADS`` - The number of parallel processes to run during testing.
 

Modified: zorg/trunk/lnt/lnt/tests/nt.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/tests/nt.py?rev=141464&r1=141463&r2=141464&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/nt.py (original)
+++ zorg/trunk/lnt/lnt/tests/nt.py Fri Oct  7 20:01:28 2011
@@ -100,6 +100,7 @@
 
         # Create the per test variables, and ensure the output directory exists.
         variables = test_module_variables.copy()
+        variables['MODULENAME'] = name
         variables['SRCROOT'] = test_path
         variables['OBJROOT'] = test_obj_path
         mkdir_p(test_obj_path)
@@ -134,8 +135,8 @@
     # Set the test module options, which we try and restrict to a tighter subset
     # than what we pass to the LNT makefiles.
     test_module_variables = {
-        'CC' : make_variables['TARGET_CC'],
-        'CXX' : make_variables['TARGET_CXX'],
+        'CC' : make_variables['TARGET_LLVMGCC'],
+        'CXX' : make_variables['TARGET_LLVMGXX'],
         'CFLAGS' : (make_variables['TARGET_FLAGS'] + ' ' +
                     make_variables['OPTFLAGS']),
         'CXXFLAGS' : (make_variables['TARGET_FLAGS'] + ' ' +