[cig-commits] r7073 - cs/buildbot/trunk/buildbot

[leif at geodynamics.org]

Author: leif
Date: 2007-06-05 15:07:37 -0700 (Tue, 05 Jun 2007)
New Revision: 7073

Modified:
   cs/buildbot/trunk/buildbot/bs.py
   cs/buildbot/trunk/buildbot/config.py
Log:
Fixes for Gale and MAG.

Modified: cs/buildbot/trunk/buildbot/bs.py
===================================================================
--- cs/buildbot/trunk/buildbot/bs.py	2007-06-05 19:29:13 UTC (rev 7072)
+++ cs/buildbot/trunk/buildbot/bs.py	2007-06-05 22:07:37 UTC (rev 7073)
@@ -32,6 +32,7 @@
               description=["compiling"] + desc,
               descriptionDone=desc + ["compile"],
               command="make all",
+              workdir=workdir,
               haltOnFailure=True),
             ]
         return steps
@@ -117,13 +118,15 @@
             s(step.ShellCommand,
               description=["configure"] + desc,
               descriptionDone=desc + ["configuration"],
-              command=["./configure.py", configureArgs],
+              command=["./configure.py"] + configureArgs,
+              workdir=workdir,
               haltOnFailure=True,
               ),
             s(step.ShellCommand,
               description=["testing"],
               descriptionDone=["tests"],
               command=["./scons/scons.py", "test"],
+              workdir=workdir,
               ),
             ]
         
@@ -198,9 +201,7 @@
         
         return steps
 
-ase = ASEBuildSystem
 
-
 class DebugBuildSystem(BuildSystem):
     """for debugging BuildBot"""
 

Modified: cs/buildbot/trunk/buildbot/config.py
===================================================================
--- cs/buildbot/trunk/buildbot/config.py	2007-06-05 19:29:13 UTC (rev 7072)
+++ cs/buildbot/trunk/buildbot/config.py	2007-06-05 22:07:37 UTC (rev 7073)
@@ -66,7 +66,7 @@
         return self.configName(config).replace(' ', '_')
 
     def getConfigureArgs(self, bs, env, config):
-        from buildbot.bs import gnu, distutils, scons, ase
+        from buildbot.bs import gnu, distutils, scons
         args = {
             gnu: [
                 "--prefix=%(PREFIX)s" % env,