[Avida-SVN] r1304 - in extras: . buildbot/local/master/MacBook_master/local-svk

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2007-02-13 09:04:49 -0500 (Tue, 13 Feb 2007)
New Revision: 1304

Modified:
   extras/
   extras/buildbot/local/master/MacBook_master/local-svk/master.cfg
Log:
 r1376 at stochastic:  kaben | 2007-02-12 20:10:51 -0500
 Refining local build master : reenable TestAvida in OS-X build slave. 



Property changes on: extras
___________________________________________________________________
Name: svk:merge
   - 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1375
   + 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1376

Modified: extras/buildbot/local/master/MacBook_master/local-svk/master.cfg
===================================================================
--- extras/buildbot/local/master/MacBook_master/local-svk/master.cfg	2007-02-13 14:04:46 UTC (rev 1303)
+++ extras/buildbot/local/master/MacBook_master/local-svk/master.cfg	2007-02-13 14:04:49 UTC (rev 1304)
@@ -164,17 +164,16 @@
   descriptionDone = ["build"],
   haltOnFailure = True,
   command = 'python support/scons/scons.py --implicit-deps-changed customOptions=support/os_x_slave_build_options.py',
-  #command = 'python support/scons/scons.py --implicit-deps-changed',
   workdir = 'avida-devel',
 )
-#osx_factory.addStep(
-#  step.ShellCommand,
-#  description = ["testing"],
-#  descriptionDone = ["test"],
-#  flunkOnFailure = True,
-#  command = './TestAvida Set_DevelBase_. Set_ExtrasBase_../avida-extras All',
-#  workdir = 'avida-devel/work',
-#)
+osx_factory.addStep(
+  step.ShellCommand,
+  description = ["testing"],
+  descriptionDone = ["test"],
+  flunkOnFailure = True,
+  command = './TestAvida Set_DevelBase_. Set_ExtrasBase_../avida-extras All',
+  workdir = 'avida-devel/work',
+)
 c['builders'].append(
   {
     'name':'OS-X',