[zorg] r183235 - Add steps to run the LNT tests for phased LNT builders.

[David Dean]

Author: ddean
Date: Tue Jun  4 11:17:51 2013
New Revision: 183235

URL: http://llvm.org/viewvc/llvm-project?rev=183235&view=rev
Log:
Add steps to run the LNT tests for phased LNT builders.

Modified:
    zorg/trunk/zorg/buildbot/builders/LNTBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/LNTBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LNTBuilder.py?rev=183235&r1=183234&r2=183235&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LNTBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LNTBuilder.py Tue Jun  4 11:17:51 2013
@@ -11,7 +11,7 @@ from buildbot.process.properties import
 import zorg
 from zorg.buildbot.builders import ClangBuilder
 from zorg.buildbot.PhasedBuilderUtils import getBuildDir, setProperty
-from zorg.buildbot.Artifacts import GetCompilerRoot
+from zorg.buildbot.Artifacts import GetCompilerRoot, package_url
 
 def _get_cc(status, stdin, stdout):
     lines = filter(bool, stdin.split('\n'))
@@ -170,8 +170,12 @@ def CreateLNTNightlyFactory(nt_flags, cc
     # parallel  : set to True if using multiple cores for faster turnaround
     #            set to False if measuring performance
     # Properties set externally but used by this method:
+    # builddir  : This property is set below
     # jobs      : This property is set by the slave, it indicates the number of
     #            cores availble to use.
+    # revision  : This property should be set by an upstream builder.
+    # slavename : This property is set by the slave
+    # buildername : This property is set by the master
 
     f = buildbot.process.factory.BuildFactory()
     # Determine the build directory.
@@ -280,5 +284,25 @@ def CreateLNTNightlyFactory(nt_flags, cc
             name='lnt.nightly-test.clean', command=['rm', '-rfv', 'nt'],
             haltOnFailure=True, description=['clean', 'LNT', 'sandbox'],
             workdir='tests'))
+    # Run the nightly test.
+    nick = '%(slavename)s-%(buildername)s'
+    args.extend(['nt', '--sandbox', 'nt', '--cc',
+            WithProperties('%(builddir)s/%(cc_path)s'), '--cxx',
+            WithProperties('%(builddir)s/%(cxx_path)s'), '--without-llvm',
+            '--test-suite', WithProperties('%(builddir)s/test-suite'),
+            '--no-timestamp', '--no-machdep-info', '--no-auto-name',
+            '--no-configure'])
+    if external_URL:
+        args.extend(['--test-externals', external_dir])
+    if parallel:
+        args.extend(['-j', WithProperties(jobs)])
+    args.extend(nt_flags)
+    f.addStep(zorg.buildbot.commands.LitTestCommand.LitTestCommand(
+            name='lnt.nightly-test', command=args, haltOnFailure=True,
+            description=['nightly test'], workdir='tests',
+            logfiles={'configure.log' : 'nt/build/configure.log',
+                      'build-tools.log' : 'nt/build/build-tools.log',
+                      'test.log' : 'nt/build/test.log',
+                      'report.json' : 'nt/build/report.json'}))
 
     return f