Skip to content

Commit

Permalink
Merge pull request #6 from csnover/selective-disabled-tests
Browse files Browse the repository at this point in the history
BUILDBOT: Disable testing of untestable platforms
  • Loading branch information
sev- committed Jan 15, 2017
2 parents 1d6c26c + ce39b99 commit ffeb8fe
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion config/master.cfg
Expand Up @@ -142,6 +142,9 @@ scumm_desktop_platforms = []
# These platforms are defined as "Build Only" and thus will not be packaged for download.
scumm_buildonly_platforms = []

# These platforms are defined as "unable to run tests" and thus will not build or run tests
scumm_untestable_platforms = []

# Native build (for triggering tests - Can't run cross compiled binaries, so can only run test on native)
scumm_native_buildname = "debian-x86_64"

Expand Down Expand Up @@ -736,6 +739,7 @@ p = {

scumm_platforms_master["ps2"] = p
scumm_platforms_stable["ps2"] = p
scumm_untestable_platforms.append("ps2")

# GP2X
scumm_root_gp2x = "/opt/toolchains/open2x-gcc-4.1.1"
Expand Down Expand Up @@ -1589,7 +1593,7 @@ for name, config in scumm_platforms_master.items():

if name in scumm_native_buildname:
f.addStep(Test(env = config["env"]))
else:
elif name not in scumm_untestable_platforms:
# Compile Tests (Runner), but do not execute (as binary is non-native)
f.addStep(Test(command = [ "make", "test/runner" ], env = config["env"]))

Expand Down

0 comments on commit ffeb8fe

Please sign in to comment.