From c8af33256e6f1e8bd38d027ab9824e67cf6d8792 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Sun, 25 Nov 2012 05:11:07 +0000 Subject: [PATCH] BUILDBOT: Add test step to native scummvm builders to run unit tests. --- config/master.cfg | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/config/master.cfg b/config/master.cfg index 8b90c98..e0f1fe0 100644 --- a/config/master.cfg +++ b/config/master.cfg @@ -1,8 +1,6 @@ # -*- python -*- # ex: set syntax=python: -# TODO: Would be nice to run "make test" -- probably as a separate task - ####### ####### ScummVM settings for buildbot ####### @@ -106,6 +104,9 @@ scumm_platforms_stable = {} # These platforms are defined as "Desktop" and so will have tools built for them scumm_desktop_platforms = [] +# Native build (for triggering tests - Can't run cross compiled binaries, so can only run test on native) +scumm_native_buildname = "debian-x86" + # debian 32bit. scumm_env_debian_x86 = copy.deepcopy(scumm_env) scumm_env_debian_x86["PATH"] = "/usr/bin:%s" % DEFAULT_PATH @@ -954,7 +955,7 @@ from buildbot.process import factory from buildbot.process.properties import WithProperties from buildbot.steps.source import Git from buildbot.steps.trigger import Trigger -from buildbot.steps.shell import Compile +from buildbot.steps.shell import Compile, Test # One lock to rule them all. # Used to prevent source updates when the nightly schedulers are busy. @@ -1105,6 +1106,9 @@ for name, config in scumm_platforms_master.items(): ], env = config["env"])) + if name in scumm_native_buildname: + f.addStep(Test(env = config["env"])) + platform_disttarget = "" if config.has_key("disttarget"): platform_disttarget = config["disttarget"] @@ -1152,6 +1156,9 @@ for name, config in scumm_platforms_stable.items(): ], env = config["env"])) + if name in scumm_native_buildname: + f.addStep(Test(env = config["env"])) + platform_disttarget = "" if config.has_key("disttarget"): platform_disttarget = config["disttarget"] @@ -1202,6 +1209,8 @@ for name, config in scumm_platforms_master.items(): ], env = config["env"])) + # No test step for tools as no unit tests currently. + platform_disttarget = "" if config.has_key("disttarget"): platform_disttarget = config["disttarget"]