From 513641fd8d1fe21413869f2c24c13f86f1b686a0 Mon Sep 17 00:00:00 2001 From: dbs Date: Wed, 2 Mar 2011 21:56:14 +0000 Subject: [PATCH] No mas. dir existence checks were checking buildmaster, not slave git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@2198 9efc2488-bf62-4759-914b-345cdb29e865 --- examples/buildbot.cfg | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/buildbot.cfg b/examples/buildbot.cfg index 252e2f4..39de297 100644 --- a/examples/buildbot.cfg +++ b/examples/buildbot.cfg @@ -1,6 +1,5 @@ # -*- python -*- # vim: set syntax=python:et:ts=4:sw=4: -import os.path # This is a sample buildmaster config file. It must be installed as # 'master.cfg' in your buildmaster's base directory. @@ -194,10 +193,12 @@ class PerlModuleTestMFHDMadness(shell.PerlModuleTest): total = 0 def has_perl_unit_tests(step): - 'If there is a /lib/ sudir in the Perl dir, there are tests' - if (os.path.exists(os.path.join(perldir, 'lib'))): - return True - return False + 'Only run Perl tests if there are tests' + if (step.build.getProperty('branch') == 'branches/rel_1_6_1'): + return False + elif (step.build.getProperty('branch') == 'branches/rel_2_0'): + return False + return True # run the Perl unit tests eg_factory.addStep(PerlModuleTestMFHDMadness( -- 2.11.0