Bug 1302907 - Use relative path to mozharness script; r=dustin

Mozharness scripts all live in "mozharness/scripts." So, we don't need
to redundantly define this path. Let's define the script as the relative
path within "mozharness/scripts" instead.

IMO this cosmetic improvement can stand on its own. However, the real
reason for this change is to pave the way for running mozharness from
a source checkout instead of downloading a zip archive of it.

MozReview-Commit-ID: FUnMiLlCcGK

--HG--
extra : rebase_source : 3a0093f1995120264fed89dc4af94eea3554bfe5
This commit is contained in:
Gregory Szorc 2016-09-14 16:56:55 -07:00
parent 4c216e4cdb
commit 30433a1b9b
4 changed files with 42 additions and 42 deletions

View File

@ -16,7 +16,7 @@ cppunit:
e10s: false
loopback-video: true
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -37,7 +37,7 @@ crashtest:
loopback-video: true
e10s: false
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -59,7 +59,7 @@ jsreftest:
max-run-time: 7200
e10s: false
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -79,7 +79,7 @@ marionette:
tier: 3
max-run-time: 3600
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -101,7 +101,7 @@ mochitest:
android-4.3-arm7-api-15/debug: 10800
default: 3600
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -123,7 +123,7 @@ mochitest-chrome:
e10s: false
max-run-time: 5400
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -140,7 +140,7 @@ mochitest-clipboard:
loopback-video: true
e10s: false
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -156,7 +156,7 @@ mochitest-gpu:
loopback-video: true
e10s: false
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -175,7 +175,7 @@ mochitest-media:
e10s: false
max-run-time: 5400
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -194,7 +194,7 @@ mochitest-webgl:
max-run-time: 7200
instance-size: xlarge
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -216,7 +216,7 @@ reftest:
loopback-video: true
e10s: false
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -238,7 +238,7 @@ robocop:
loopback-video: true
e10s: false
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
config:
- mozharness/configs/android/androidarm_4_3.py
@ -260,7 +260,7 @@ xpcshell:
loopback-video: true
e10s: false
mozharness:
script: mozharness/scripts/android_emulator_unittest.py
script: android_emulator_unittest.py
no-read-buildbot-config: true
extra-options:
- --test-suite=xpcshell

View File

@ -14,7 +14,7 @@ win32/debug:
max-run-time: 7200
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
script: fx_desktop_build.py
config:
- builds/taskcluster_firefox_win32_debug.py
@ -34,7 +34,7 @@ win32/opt:
max-run-time: 7200
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
script: fx_desktop_build.py
config:
- builds/taskcluster_firefox_win32_opt.py
@ -54,7 +54,7 @@ win64/debug:
max-run-time: 7200
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
script: fx_desktop_build.py
config:
- builds/taskcluster_firefox_win64_debug.py
@ -74,7 +74,7 @@ win64/opt:
max-run-time: 7200
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
script: fx_desktop_build.py
config:
- builds/taskcluster_firefox_win64_opt.py

View File

@ -11,7 +11,7 @@ cppunit:
treeherder-symbol: tc(Cpp)
e10s: false
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:
@ -31,7 +31,7 @@ crashtest:
suite: reftest/crashtest
treeherder-symbol: tc-R(C)
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
chunked: true
no-read-buildbot-config: true
config:
@ -50,7 +50,7 @@ external-media-tests:
tier: 2
max-run-time: 5400
mozharness:
script: mozharness/scripts/firefox_media_tests_buildbot.py
script: firefox_media_tests_buildbot.py
no-read-buildbot-config: true
config:
- mozharness/configs/mediatests/buildbot_posix_config.py
@ -64,7 +64,7 @@ firefox-ui-functional-local:
tier: 1
docker-image: {"in-tree": "desktop1604-test"}
mozharness:
script: mozharness/scripts/firefox_ui_tests/functional.py
script: firefox_ui_tests/functional.py
config:
- mozharness/configs/firefox_ui_tests/taskcluster.py
- mozharness/configs/remove_executables.py
@ -79,7 +79,7 @@ firefox-ui-functional-remote:
tier: 2
docker-image: {"in-tree": "desktop1604-test"}
mozharness:
script: mozharness/scripts/firefox_ui_tests/functional.py
script: firefox_ui_tests/functional.py
config:
- mozharness/configs/firefox_ui_tests/taskcluster.py
- mozharness/configs/remove_executables.py
@ -93,7 +93,7 @@ gtest:
e10s: false
instance-size: xlarge
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:
@ -110,7 +110,7 @@ jittests:
e10s: false
chunks: 6
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:
@ -126,7 +126,7 @@ jsreftest:
treeherder-symbol: tc-R(J)
chunks: 2
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:
@ -142,7 +142,7 @@ marionette:
treeherder-symbol: tc(Mn)
max-run-time: 5400
mozharness:
script: mozharness/scripts/marionette.py
script: marionette.py
no-read-buildbot-config: true
config:
- mozharness/configs/marionette/prod_config.py
@ -156,7 +156,7 @@ mochitest:
chunks: 10
max-run-time: 5400
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
chunked: true
config:
@ -177,7 +177,7 @@ mochitest-a11y:
loopback-video: true
e10s: false
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
chunked: true
config:
@ -199,7 +199,7 @@ mochitest-browser-chrome:
linux64/debug: 5400
default: 3600
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:
@ -220,7 +220,7 @@ mochitest-chrome:
chunks: 3
e10s: false
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:
@ -237,7 +237,7 @@ mochitest-clipboard:
loopback-video: true
instance-size: xlarge
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
chunked: true
config:
@ -261,7 +261,7 @@ mochitest-devtools-chrome:
linux64/debug: false
default: both
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:
@ -284,7 +284,7 @@ mochitest-gpu:
treeherder-symbol: tc-M(gpu)
loopback-video: true
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
chunked: true
config:
@ -303,7 +303,7 @@ mochitest-jetpack:
e10s: false
max-run-time: 5400
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
chunked: true
config:
@ -323,7 +323,7 @@ mochitest-media:
instance-size: large
docker-image: {"in-tree": "desktop1604-test"}
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
chunked: true
config:
@ -341,7 +341,7 @@ mochitest-webgl:
chunks: 3
loopback-video: true
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
chunked: true
config:
@ -360,7 +360,7 @@ reftest:
treeherder-symbol: tc-R(R)
chunks: 8
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:
@ -376,7 +376,7 @@ reftest-no-accel:
treeherder-symbol: tc-R(Ru)
chunks: 8
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:
@ -396,7 +396,7 @@ web-platform-tests:
docker-image: {"in-tree": "desktop1604-test"}
checkout: true
mozharness:
script: mozharness/scripts/web_platform_tests.py
script: web_platform_tests.py
no-read-buildbot-config: true
config:
- mozharness/configs/web_platform_tests/prod_config.py
@ -413,7 +413,7 @@ web-platform-tests-reftests:
docker-image: {"in-tree": "desktop1604-test"}
checkout: true
mozharness:
script: mozharness/scripts/web_platform_tests.py
script: web_platform_tests.py
no-read-buildbot-config: true
config:
- mozharness/configs/web_platform_tests/prod_config.py
@ -432,7 +432,7 @@ xpcshell:
max-run-time: 5400
e10s: false
mozharness:
script: mozharness/scripts/desktop_unittest.py
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:

View File

@ -141,7 +141,7 @@ echo -e "#!/usr/bin/env bash
# Some mozharness scripts assume base_work_dir is in
# the current working directory, see bug 1279237
cd $WORKSPACE
cmd=\"python2.7 $WORKSPACE/${MOZHARNESS_SCRIPT} ${config_cmds} ${@} \${@}\"
cmd=\"python2.7 $WORKSPACE/mozharness/scripts/${MOZHARNESS_SCRIPT} ${config_cmds} ${@} \${@}\"
echo \"Running: \${cmd}\"
exec \${cmd}" > ${mozharness_bin}
chmod +x ${mozharness_bin}