From 0e985389723a06b9cf51ed502af32e93f467289a Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 31 Aug 2015 16:15:44 +0200 Subject: [PATCH] Run WPT tests in debug mode This lets us use debug_assert!() in Servo. Tests should be run fast enough now that Servo improved. --- buildbot/master/master.cfg | 44 +++++++++++++++++++------------------- homu/cfg.toml | 4 ++-- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg index dafb19d8..35d9985a 100644 --- a/buildbot/master/master.cfg +++ b/buildbot/master/master.cfg @@ -105,7 +105,7 @@ c['schedulers'] = [] c['schedulers'].append(schedulers.AnyBranchScheduler( name="servo-auto", treeStableTimer=None, - builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-ref-unit", "mac-rel-css", "android", "gonk"], + builderNames=["linux-dev-ref-unit", "linux-dev-wpt", "mac-dev-wpt", "mac-dev-ref-unit", "mac-dev-css", "android", "gonk"], change_filter=util.ChangeFilter(filter_fn=servo_auto_try_filter), )) c['schedulers'].append(schedulers.SingleBranchScheduler( @@ -116,7 +116,7 @@ c['schedulers'].append(schedulers.SingleBranchScheduler( )) c['schedulers'].append(schedulers.ForceScheduler( name="force", - builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-ref-unit", "mac-rel-css", "android", "gonk", "android-nightly"] + builderNames=["linux-dev-ref-unit", "linux-dev-wpt", "mac-dev-wpt", "mac-dev-ref-unit", "mac-dev-css", "android", "gonk", "android-nightly"] )) c['schedulers'].append(schedulers.Nightly( name="Nightly", @@ -177,7 +177,7 @@ mac_test_env = dict({ 'SERVO_CACHE_DIR': '/Users/servo/.servo' }, **common_test_env) -linux_dev_factory = create_servo_factory([ +linux_dev_ref_unit_factory = create_servo_factory([ steps.ShellCommand(command=["./mach", "test-tidy"], env=linux_headless_env), steps.Compile(command=["./mach", "build", "--dev"], env=linux_headless_env), steps.ShellCommand(command=["./mach", "test-unit"], env=linux_headless_env), @@ -185,27 +185,27 @@ linux_dev_factory = create_servo_factory([ steps.Compile(command=["./mach", "build-cef"], env=linux_headless_env), ]) -linux_rel_factory = create_servo_factory([ - steps.Compile(command=["./mach", "build", "--release"], env=linux_headless_env), +linux_dev_wpt_factory = create_servo_factory([ + steps.Compile(command=["./mach", "build", "--dev"], env=linux_headless_env), steps.ShellCommand(command=["./mach", "test-wpt-failure"], env=linux_headless_env), - steps.ShellCommand(command=["./mach", "test-wpt", "--release", "--processes", "24", + steps.ShellCommand(command=["./mach", "test-wpt", "--processes", "24", "--log-raw", "test-wpt.log"], env=linux_headless_env, logfiles={"test-wpt.log": "test-wpt.log"}), steps.ShellCommand(command=["gzip", "test-wpt.log"], env=linux_headless_env), - steps.ShellCommand(command=["./mach", "test-css", "--release", "--processes", "24", + steps.ShellCommand(command=["./mach", "test-css", "--processes", "24", "--log-raw", "test-css.log"], env=linux_headless_env, logfiles={"test-css.log": "test-css.log"}), steps.ShellCommand(command=["gzip", "test-css.log"], env=linux_headless_env), - steps.Compile(command=["./mach", "build-cef", "--release"], env=linux_headless_env), + steps.Compile(command=["./mach", "build-cef"], env=linux_headless_env), ]) task_limited_test_env = dict({'RUST_TEST_TASKS': '1'}, **mac_test_env) -mac_rel_wpt_factory = create_servo_factory([ +mac_dev_wpt_factory = create_servo_factory([ steps.ShellCommand(command=["./mach", "test-tidy"]), - steps.Compile(command=["./mach", "build", "--release"], env=mac_test_env), + steps.Compile(command=["./mach", "build", "--dev"], env=mac_test_env), steps.ShellCommand(command=["./mach", "test-wpt-failure"], env=mac_test_env), - steps.ShellCommand(command=["./mach", "test-wpt", "--release", "--processes", "4", + steps.ShellCommand(command=["./mach", "test-wpt", "--processes", "4", "--log-raw", "test-wpt.log"], env=mac_test_env, logfiles={"test-wpt.log": "test-wpt.log"}), steps.ShellCommand(command=["gzip", "test-wpt.log"], env=mac_test_env), @@ -219,9 +219,9 @@ mac_dev_ref_unit_factory = create_servo_factory([ steps.Compile(command=["./mach", "build-cef"], env=mac_test_env), ]) -mac_rel_css_factory = create_servo_factory([ - steps.Compile(command=["./mach", "build", "--release"], env=mac_test_env), - steps.ShellCommand(command=["./mach", "test-css", "--release", "--processes", "4", +mac_dev_css_factory = create_servo_factory([ + steps.Compile(command=["./mach", "build", "--dev"], env=mac_test_env), + steps.ShellCommand(command=["./mach", "test-css", "--processes", "4", "--log-raw", "test-css.log"], env=mac_test_env, logfiles={"test-css.log": "test-css.log"}), steps.ShellCommand(command=["gzip", "test-css.log"], env=mac_test_env), @@ -305,16 +305,16 @@ def branch_priority(builder, requests): c['builders'] = [] c['builders'].append(util.BuilderConfig( - name="linux-dev", + name="linux-dev-ref-unit", slavenames=LINUX_SLAVES, - factory=linux_dev_factory, + factory=linux_dev_ref_unit_factory, nextBuild=branch_priority, category="auto", )) c['builders'].append(util.BuilderConfig( - name="linux-rel", + name="linux-dev-wpt", slavenames=LINUX_SLAVES, - factory=linux_rel_factory, + factory=linux_dev_wpt_factory, nextBuild=branch_priority, category="auto", )) @@ -334,9 +334,9 @@ c['builders'].append(util.BuilderConfig( category="auto", )) c['builders'].append(util.BuilderConfig( - name="mac-rel-wpt", + name="mac-dev-wpt", slavenames=MAC_SLAVES, - factory=mac_rel_wpt_factory, + factory=mac_dev_wpt_factory, nextBuild=branch_priority, category="auto", )) @@ -348,9 +348,9 @@ c['builders'].append(util.BuilderConfig( category="auto", )) c['builders'].append(util.BuilderConfig( - name="mac-rel-css", + name="mac-dev-css", slavenames=MAC_SLAVES, - factory=mac_rel_css_factory, + factory=mac_dev_css_factory, nextBuild=branch_priority, category="auto", )) diff --git a/homu/cfg.toml b/homu/cfg.toml index 171f48be..6618ea6f 100644 --- a/homu/cfg.toml +++ b/homu/cfg.toml @@ -37,8 +37,8 @@ secret = "{{ pillar["homu"]["gh-webhook-secret"] }}" [repo.servo.buildbot] url = "http://build.servo.org" secret = "{{ pillar["homu"]["buildbot-secret"] }}" -builders = ["linux-dev", "linux-rel", "android", "mac-dev-ref-unit", "mac-rel-wpt", "mac-rel-css", "gonk"] -try_builders = ["linux-dev", "linux-rel", "android", "mac-dev-ref-unit", "mac-rel-wpt", "mac-rel-css", "gonk"] +builders = ["linux-dev-ref-unit", "linux-dev-wpt", "android", "mac-dev-wpt", "mac-dev-ref-unit", "mac-dev-css", "gonk"] +try_builders = ["linux-dev-ref-unit", "linux-dev-wpt", "android", "mac-dev-wpt", "mac-dev-ref-unit", "mac-dev-css", "gonk"] username = "{{ pillar["homu"]["buildbot-http-user"] }}" password = "{{ pillar["homu"]["buildbot-http-pass"] }}"