[llvm-commits] [zorg] r169353 - /zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

[David Blaikie]

Author: dblaikie
Date: Tue Dec  4 22:33:42 2012
New Revision: 169353

URL: http://llvm.org/viewvc/llvm-project?rev=169353&view=rev
Log:
Build gdb to test it.

Turns out just adding the relevant GDB to the PATH is insufficient. I suspect
it's some other contents (LD_LIBRARY_PATH? python libraries? not sure what path
they use) that needs to be added, and I'd be glad to but not sure it's worth
the time to figure out.

For now this does incremental rebuilds anyway (which should never change) so
the build step only takes about a minute on my private builder.

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

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=169353&r1=169352&r2=169353&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Tue Dec  4 22:33:42 2012
@@ -575,12 +575,15 @@
     f.addStep(SVN(name='svn-clang-tests', mode='update',
                   svnurl='http://llvm.org/svn/llvm-project/clang-tests-external/trunk/gdb/7.5',
                   workdir='clang-tests/src'))
-    f.addStep(Configure(command='../src/gdb/testsuite/configure',
+    f.addStep(Configure(command='../src/configure',
                         workdir='clang-tests/build/'))
+    f.addStep(WarningCountingShellCommand(name='gdb-75-build',
+                                          command=['make', WithProperties('-j%s' % jobs)],
+                                          haltOnFailure=True,
+                                          workdir='clang-tests/build'))
     f.addStep(DejaGNUCommand.DejaGNUCommand(
             name='gdb-75-check',
-            command=["make", "-k", WithProperties("-j%s" % jobs), "check"] + make_vars,
-            env={'PATH': os.pathsep.join(['${HOME}/gdb-install/bin', '${PATH}'])},
+            command=['make', '-k', WithProperties('-j%s' % jobs), 'check'] + make_vars,
             workdir='clang-tests/build',
             logfiles={'dg.sum':'gdb.sum', 
                       'gdb.log':'gdb.log'}))