mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1181261 - Merge configs from testing/config/mozharness into mozharness proper, r=chmanchester 

The config files under testing/config/mozharness were created so that certain mozharness options
such as test harness arguments could ride the trees, simplifying a lot of logic in mozharness.
But now that mozharness itself is in-tree, these configs no longer serve any purpose. Instead
they are merged into the main configs at testing/mozharness/configs.

--HG--
extra : commitid : KT4Ulv5TsiS
extra : rebase_source : 3cd1284680ddbddf0f1712a985a07579b3905849
extra : source : 28fa968ea46ca3e232b8cfbb4a88e9a492e71b16
This commit is contained in:
Andrew Halberstadt 2015-08-14 16:54:08 -04:00
Родитель 27e3e5e35a
Коммит c703b7c25f
46 изменённых файлов: 1507 добавлений и 1285 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

154
testing/config/mozharness/android_arm_4_3_config.py
Просмотреть файл

@ -1,154 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"suite_definitions": {
"mochitest": {
"run_filename": "runtestsremote.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=adb",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
},
"mochitest-gl": {
"run_filename": "runtestsremote.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=adb",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
"--total-chunks=4",
"--subsuite=webgl",
],
},
"robocop": {
"run_filename": "runrobocop.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=adb",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--total-chunks=4",
"--robocop-apk=../../robocop.apk",
"--robocop-ini=robocop.ini",
],
},
"reftest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path", "%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"--total-chunks=16",
"tests/layout/reftests/reftest.list",
],
},
"crashtest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path",
"%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"--total-chunks=2",
"tests/testing/crashtest/crashtests.list",
],
},
"jsreftest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s", "--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"../jsreftest/tests/jstests.list",
"--total-chunks=6",
"--extra-profile-file=jsreftest/tests/user.js",
],
},
"xpcshell": {
"run_filename": "remotexpcshelltests.py",
"testsdir": "xpcshell",
"options": [
"--dm_trans=adb",
"--xre-path=%(xre_path)s",
"--testing-modules-dir=%(modules_dir)s",
"--apk=%(installer_path)s",
"--no-logfiles",
"--symbols-path=%(symbols_path)s",
"--manifest=tests/xpcshell.ini",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--total-chunks=3",
],
},
"cppunittest": {
"run_filename": "remotecppunittests.py",
"testsdir": "cppunittest",
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(xre_path)s",
"--dm_trans=adb",
"--localBinDir=../bin",
"--apk=%(installer_path)s",
".",
],
},
}, # end suite_definitions
}

156
testing/config/mozharness/android_arm_config.py
Просмотреть файл

@ -1,156 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"suite_definitions": {
"mochitest": {
"run_filename": "runtestsremote.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=sut",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
},
"mochitest-gl": {
"run_filename": "runtestsremote.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=sut",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
"--total-chunks=4",
"--subsuite=webgl",
],
},
"robocop": {
"run_filename": "runrobocop.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=sut",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--total-chunks=4",
"--robocop-apk=../../robocop.apk",
"--robocop-ini=robocop.ini",
],
},
"reftest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path",
"%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"--total-chunks=16",
"tests/layout/reftests/reftest.list",
],
},
"crashtest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path",
"%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"--total-chunks=2",
"tests/testing/crashtest/crashtests.list",
],
},
"jsreftest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path",
"%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"../jsreftest/tests/jstests.list",
"--total-chunks=6",
"--extra-profile-file=jsreftest/tests/user.js",
],
},
"xpcshell": {
"run_filename": "remotexpcshelltests.py",
"testsdir": "xpcshell",
"options": [
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--xre-path=%(xre_path)s",
"--testing-modules-dir=%(modules_dir)s",
"--apk=%(installer_path)s",
"--no-logfiles",
"--symbols-path=%(symbols_path)s",
"--manifest=tests/xpcshell.ini",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--total-chunks=3",
],
},
}, # end suite_definitions
}

140
testing/config/mozharness/android_panda_config.py
Просмотреть файл

@ -1,140 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=tests/bin",
"--dm_trans=sut",
"--deviceIP=%(device_ip)s",
"--localBinDir=../tests/bin",
"--apk=%(apk_path)s",
"--skip-manifest=../tests/cppunittests/android_cppunittest_manifest.txt"
],
"run_filename": "remotecppunittests.py",
"testsdir": "cppunittest"
},
"crashtest": {
"options": [
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--utility-path=../hostutils/bin",
"--app=%(app_name)s",
"--ignore-window-size",
"--bootstrap",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--symbols-path=%(symbols_path)s",
"reftest/tests/testing/crashtest/crashtests.list"
],
"run_filename": "remotereftest.py",
"testsdir": "reftest"
},
"jittest": {
"options": [
"bin/js",
"--remote",
"-j",
"1",
"--deviceTransport=sut",
"--deviceIP=%(device_ip)s",
"--localLib=../tests/bin",
"--no-slow",
"--no-progress",
"--format=automation",
"--jitflags=all"
],
"run_filename": "jit_test.py",
"testsdir": "jit-test/jit-test"
},
"jsreftest": {
"options": [
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--utility-path=../hostutils/bin",
"--app=%(app_name)s",
"--ignore-window-size",
"--bootstrap",
"--extra-profile-file=jsreftest/tests/user.js",
"jsreftest/tests/jstests.list",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "remotereftest.py",
"testsdir": "reftest"
},
"mochitest": {
"options": [
"--dm_trans=sut",
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--utility-path=../hostutils/bin",
"--certificate-path=certs",
"--app=%(app_name)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
"run_filename": "runtestsremote.py",
"testsdir": "mochitest"
},
"reftest": {
"options": [
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--utility-path=../hostutils/bin",
"--app=%(app_name)s",
"--ignore-window-size",
"--bootstrap",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--symbols-path=%(symbols_path)s",
"reftest/tests/layout/reftests/reftest.list"
],
"run_filename": "remotereftest.py",
"testsdir": "reftest"
},
"robocop": {
"options": [
"--dm_trans=sut",
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--utility-path=../hostutils/bin",
"--certificate-path=certs",
"--app=%(app_name)s",
"--console-level=INFO",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--symbols-path=%(symbols_path)s",
"--robocop-ini=mochitest/robocop.ini"
],
"run_filename": "runrobocop.py",
"testsdir": "mochitest"
},
"xpcshell": {
"options": [
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--manifest=xpcshell/tests/xpcshell.ini",
"--build-info-json=xpcshell/mozinfo.json",
"--testing-modules-dir=modules",
"--local-lib-dir=../fennec",
"--apk=../%(apk_name)s",
"--no-logfiles",
"--symbols-path=%(symbols_path)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
],
"run_filename": "remotexpcshelltests.py",
"testsdir": "xpcshell"
}
}
}

57
testing/config/mozharness/android_x86_config.py
Просмотреть файл

@ -1,57 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"suite_definitions": {
"mochitest": {
"run_filename": "runtestsremote.py",
"options": ["--dm_trans=sut",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
},
"reftest": {
"run_filename": "remotereftest.py",
"options": ["--app=%(app)s",
"--ignore-window-size",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path", "%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
],
},
"xpcshell": {
"run_filename": "remotexpcshelltests.py",
"options": ["--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--xre-path=%(xre_path)s",
"--testing-modules-dir=%(modules_dir)s",
"--apk=%(installer_path)s",
"--no-logfiles",
"--symbols-path=%(symbols_path)s",
"--manifest=tests/xpcshell.ini",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
],
},
}, # end suite_definitions
}

41
testing/config/mozharness/b2g_desktop_config.py
Просмотреть файл

@ -1,41 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"suite_definitions": {
"mochitest": {
"options": [
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--profile=%(gaia_profile)s",
"--app=%(application)s",
"--desktop",
"--utility-path=%(utility_path)s",
"--certificate-path=%(cert_path)s",
"--symbols-path=%(symbols_path)s",
"--browser-arg=%(browser_arg)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
"run_filename": "runtestsb2g.py",
"testsdir": "mochitest"
},
"reftest": {
"options": [
"--desktop",
"--profile=%(gaia_profile)s",
"--appname=%(application)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--browser-arg=%(browser_arg)s",
"--symbols-path=%(symbols_path)s",
"%(test_manifest)s"
],
"run_filename": "runreftestsb2g.py",
"testsdir": "reftest"
}
}
}

144
testing/config/mozharness/b2g_emulator_config.py
Просмотреть файл

@ -1,144 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"suite_definitions": {
"cppunittest": {
"options": [
"--dm_trans=adb",
"--symbols-path=%(symbols_path)s",
"--xre-path=%(xre_path)s",
"--addEnv",
"LD_LIBRARY_PATH=/vendor/lib:/system/lib:/system/b2g",
"--with-b2g-emulator=%(b2gpath)s",
"."
],
"run_filename": "remotecppunittests.py",
"testsdir": "cppunittest"
},
"crashtest": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--emulator-res=800x1000",
"--logdir=%(logcat_dir)s",
"--remote-webserver=%(remote_webserver)s",
"--ignore-window-size",
"--xre-path=%(xre_path)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"tests/testing/crashtest/crashtests.list"
],
"run_filename": "runreftestb2g.py",
"testsdir": "reftest"
},
"jsreftest": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--emulator-res=800x1000",
"--logdir=%(logcat_dir)s",
"--remote-webserver=%(remote_webserver)s",
"--ignore-window-size",
"--xre-path=%(xre_path)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--extra-profile-file=jsreftest/tests/user.js",
"jsreftest/tests/jstests.list"
],
"run_filename": "remotereftest.py",
"testsdir": "reftest"
},
"mochitest": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--logdir=%(logcat_dir)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--certificate-path=%(certificate_path)s",
"--screenshot-on-fail",
"%(test_path)s"
],
"run_filename": "runtestsb2g.py",
"testsdir": "mochitest"
},
"mochitest-chrome": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--logdir=%(logcat_dir)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--quiet",
"--chrome",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--certificate-path=%(certificate_path)s",
"--screenshot-on-fail",
"%(test_path)s"
],
"run_filename": "runtestsb2g.py",
"testsdir": "mochitest"
},
"reftest": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--emulator-res=800x1000",
"--logdir=%(logcat_dir)s",
"--remote-webserver=%(remote_webserver)s",
"--ignore-window-size",
"--xre-path=%(xre_path)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--enable-oop",
"tests/layout/reftests/reftest.list"
],
"run_filename": "runreftestsb2g.py",
"testsdir": "reftest"
},
"xpcshell": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--logdir=%(logcat_dir)s",
"--manifest=tests/xpcshell.ini",
"--use-device-libs",
"--testing-modules-dir=%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
],
"run_filename": "runtestsb2g.py",
"testsdir": "xpcshell"
}
}
}

4
testing/config/mozharness/linux_config.py
Просмотреть файл

@ -2,6 +2,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# XXX Bug 1181261 - Please update config in testing/mozharness/config
# instead. This file is still needed for mulet mochitests, but should
# be removed once bug 1188330 is finished.
config = {
"suite_definitions": {
"cppunittest": {

5
testing/config/mozharness/linux_mulet_config.py
Просмотреть файл

@ -1,4 +1,9 @@
# This is used by mozharness' mulet_unittest.py
# XXX Bug 1181261 - Please update config in testing/mozharness/config
# instead. This file is still needed for mulet reftests, but should
# be removed once bug 1188330 is finished.
config = {
# testsuite options
"reftest_options": [

94
testing/config/mozharness/mac_config.py
Просмотреть файл

@ -1,94 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(abs_app_dir)s"
],
"run_filename": "runcppunittests.py",
"testsdir": "cppunittest"
},
"jittest": {
"options": [
"tests/bin/js",
"--no-slow",
"--no-progress",
"--format=automation",
"--jitflags=all"
],
"run_filename": "jit_test.py",
"testsdir": "jit-test/jit-test"
},
"mochitest": {
"options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
"run_filename": "runtests.py",
"testsdir": "mochitest"
},
"mozbase": {
"options": [
"-b",
"%(binary_path)s"
],
"run_filename": "test.py",
"testsdir": "mozbase"
},
"mozmill": {
"options": [
"--binary=%(binary_path)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "runtestlist.py",
"testsdir": "mozmill"
},
"reftest": {
"options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "runreftest.py",
"testsdir": "reftest"
},
"webapprt": {
"options": [
"--app=%(app_path)s",
"--xre-path=%(abs_res_dir)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--console-level=INFO",
"--testing-modules-dir=tests/modules",
"--quiet"
],
"run_filename": "runtests.py",
"testsdir": "mochitest"
},
"xpcshell": {
"options": [
"--symbols-path=%(symbols_path)s",
"--test-plugin-path=%(test_plugin_path)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--utility-path=tests/bin",
],
"run_filename": "runxpcshelltests.py",
"testsdir": "xpcshell"
}
}
}

91
testing/config/mozharness/marionette.py
Просмотреть файл

@ -1,91 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"suite_definitions": {
"gaiatest_desktop": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--gecko-log=%(gecko_log)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s"
],
"run_filename": "",
"testsdir": ""
},
"gaiatest_emulator": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_desktop": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"webapi_desktop": {
"options": [],
"run_filename": "",
"testsdir": ""
},
"webapi_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--symbols-path=%(symbols_path)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
}
}
}

52
testing/config/mozharness/taskcluster_linux_config.py
Просмотреть файл

@ -1,52 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"reftest_options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s"
],
"mochitest_options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--setpref=webgl.force-enabled=true",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
"webapprt_options": [
"--app=%(app_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--console-level=INFO",
"--testing-modules-dir=tests/modules",
"--quiet"
],
"xpcshell_options": [
"--symbols-path=%(symbols_path)s",
"--test-plugin-path=%(test_plugin_path)s"
],
"cppunittest_options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(abs_app_dir)s"
],
"jittest_options": [
"tests/bin/js",
"--no-slow",
"--no-progress",
"--format=automation",
"--jitflags=all"
],
"mozbase_options": [
"-b", "%(binary_path)s"
],
}

15
testing/config/mozharness/try_arguments.py
Просмотреть файл

@ -1,15 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Because this list exposes new surface to our interface to try, and could
# easily produce unexpected results if misused, this should only include
# arguments likely to work with multiple harnesses, and will have unintended
# effects if conflicts with TryParser are introduced.
config = {
'--tag': {
'action': 'append',
'dest': 'tags',
'default': None,
},
}

15
testing/config/mozharness/web_platform_tests_config.py
Просмотреть файл

@ -1,15 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"options": [
"--prefs-root=%(test_path)s/prefs",
"--processes=1",
"--config=%(test_path)s/wptrunner.ini",
"--ca-cert-path=%(test_path)s/certs/cacert.pem",
"--host-key-path=%(test_path)s/certs/web-platform.test.key",
"--host-cert-path=%(test_path)s/certs/web-platform.test.pem",
"--certutil-binary=%(test_install_path)s/bin/certutil",
],
}

93
testing/config/mozharness/windows_config.py
Просмотреть файл

@ -1,93 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
config = {
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(abs_app_dir)s"
],
"run_filename": "runcppunittests.py",
"testsdir": "cppunittest"
},
"jittest": {
"options": [
"tests/bin/js",
"--no-slow",
"--no-progress",
"--format=automation",
"--jitflags=all"
],
"run_filename": "jit_test.py",
"testsdir": "jit-test/jit-test"
},
"mochitest": {
"options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
"run_filename": "runtests.py",
"testsdir": "mochitest"
},
"mozbase": {
"options": [
"-b",
"%(binary_path)s"
],
"run_filename": "test.py",
"testsdir": "mozbase"
},
"mozmill": {
"options": [
"--binary=%(binary_path)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "runtestlist.py",
"testsdir": "mozmill"
},
"reftest": {
"options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "runreftest.py",
"testsdir": "reftest"
},
"webapprt": {
"options": [
"--app=%(app_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--console-level=INFO",
"--testing-modules-dir=tests/modules",
"--quiet"
],
"run_filename": "runtests.py",
"testsdir": "mochitest"
},
"xpcshell": {
"options": [
"--symbols-path=%(symbols_path)s",
"--test-plugin-path=%(test_plugin_path)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--utility-path=tests/bin",
],
"run_filename": "runxpcshelltests.py",
"testsdir": "xpcshell"
}
}
}

136
testing/mozharness/configs/android/android_panda_releng.py
Просмотреть файл

@ -14,8 +14,6 @@ config = {
"verify_path": "/builds/sut_tools/verify.py",
"install_app_path": "/builds/sut_tools/installApp.py",
"logcat_path": "/builds/sut_tools/logcat.py",
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/android_panda_config.py",
"all_mochitest_suites": {
"mochitest-1": ["--total-chunks=8", "--this-chunk=1"],
"mochitest-2": ["--total-chunks=8", "--this-chunk=2"],
@ -74,6 +72,140 @@ config = {
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=tests/bin",
"--dm_trans=sut",
"--deviceIP=%(device_ip)s",
"--localBinDir=../tests/bin",
"--apk=%(apk_path)s",
"--skip-manifest=../tests/cppunittests/android_cppunittest_manifest.txt"
],
"run_filename": "remotecppunittests.py",
"testsdir": "cppunittest"
},
"crashtest": {
"options": [
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--utility-path=../hostutils/bin",
"--app=%(app_name)s",
"--ignore-window-size",
"--bootstrap",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--symbols-path=%(symbols_path)s",
"reftest/tests/testing/crashtest/crashtests.list"
],
"run_filename": "remotereftest.py",
"testsdir": "reftest"
},
"jittest": {
"options": [
"bin/js",
"--remote",
"-j",
"1",
"--deviceTransport=sut",
"--deviceIP=%(device_ip)s",
"--localLib=../tests/bin",
"--no-slow",
"--no-progress",
"--format=automation",
"--jitflags=all"
],
"run_filename": "jit_test.py",
"testsdir": "jit-test/jit-test"
},
"jsreftest": {
"options": [
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--utility-path=../hostutils/bin",
"--app=%(app_name)s",
"--ignore-window-size",
"--bootstrap",
"--extra-profile-file=jsreftest/tests/user.js",
"jsreftest/tests/jstests.list",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "remotereftest.py",
"testsdir": "reftest"
},
"mochitest": {
"options": [
"--dm_trans=sut",
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--utility-path=../hostutils/bin",
"--certificate-path=certs",
"--app=%(app_name)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
"run_filename": "runtestsremote.py",
"testsdir": "mochitest"
},
"reftest": {
"options": [
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--utility-path=../hostutils/bin",
"--app=%(app_name)s",
"--ignore-window-size",
"--bootstrap",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--symbols-path=%(symbols_path)s",
"reftest/tests/layout/reftests/reftest.list"
],
"run_filename": "remotereftest.py",
"testsdir": "reftest"
},
"robocop": {
"options": [
"--dm_trans=sut",
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--utility-path=../hostutils/bin",
"--certificate-path=certs",
"--app=%(app_name)s",
"--console-level=INFO",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--symbols-path=%(symbols_path)s",
"--robocop-ini=mochitest/robocop.ini"
],
"run_filename": "runrobocop.py",
"testsdir": "mochitest"
},
"xpcshell": {
"options": [
"--deviceIP=%(device_ip)s",
"--xre-path=../hostutils/xre",
"--manifest=xpcshell/tests/xpcshell.ini",
"--build-info-json=xpcshell/mozinfo.json",
"--testing-modules-dir=modules",
"--local-lib-dir=../fennec",
"--apk=../%(apk_name)s",
"--no-logfiles",
"--symbols-path=%(symbols_path)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
],
"run_filename": "remotexpcshelltests.py",
"testsdir": "xpcshell"
}
},
"pip_index": False,
"buildbot_json_path": "buildprops.json",
"mobile_imaging_format": "http://mobile-imaging",

152
testing/mozharness/configs/android/androidarm.py
Просмотреть файл

@ -54,6 +54,156 @@ config = {
"sut_port1": 20701,
"sut_port2": 20700
},
"suite_definitions": {
"mochitest": {
"run_filename": "runtestsremote.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=sut",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
},
"mochitest-gl": {
"run_filename": "runtestsremote.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=sut",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
"--total-chunks=4",
"--subsuite=webgl",
],
},
"robocop": {
"run_filename": "runrobocop.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=sut",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--total-chunks=4",
"--robocop-apk=../../robocop.apk",
"--robocop-ini=robocop.ini",
],
},
"reftest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path",
"%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"--total-chunks=16",
"tests/layout/reftests/reftest.list",
],
},
"crashtest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path",
"%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"--total-chunks=2",
"tests/testing/crashtest/crashtests.list",
],
},
"jsreftest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path",
"%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"../jsreftest/tests/jstests.list",
"--total-chunks=6",
"--extra-profile-file=jsreftest/tests/user.js",
],
},
"xpcshell": {
"run_filename": "remotexpcshelltests.py",
"testsdir": "xpcshell",
"options": [
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--xre-path=%(xre_path)s",
"--testing-modules-dir=%(modules_dir)s",
"--apk=%(installer_path)s",
"--no-logfiles",
"--symbols-path=%(symbols_path)s",
"--manifest=tests/xpcshell.ini",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--total-chunks=3",
],
},
}, # end suite_definitions
"test_suite_definitions": {
"jsreftest-1": {
"category": "jsreftest",
@ -280,8 +430,6 @@ config = {
"extra_args": ["--this-chunk=4"],
},
}, # end of "test_definitions"
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/android_arm_config.py",
"download_minidump_stackwalk": True,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",

150
testing/mozharness/configs/android/androidarm_4_3.py
Просмотреть файл

@ -60,6 +60,154 @@ config = {
"ssl_port": "4454", # starting ssl port to use for the server
"emulator_port": 5554,
},
"suite_definitions": {
"mochitest": {
"run_filename": "runtestsremote.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=adb",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
},
"mochitest-gl": {
"run_filename": "runtestsremote.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=adb",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
"--total-chunks=4",
"--subsuite=webgl",
],
},
"robocop": {
"run_filename": "runrobocop.py",
"testsdir": "mochitest",
"options": [
"--dm_trans=adb",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--total-chunks=4",
"--robocop-apk=../../robocop.apk",
"--robocop-ini=robocop.ini",
],
},
"reftest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path", "%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"--total-chunks=16",
"tests/layout/reftests/reftest.list",
],
},
"crashtest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path",
"%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"--total-chunks=2",
"tests/testing/crashtest/crashtests.list",
],
},
"jsreftest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s", "--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"../jsreftest/tests/jstests.list",
"--total-chunks=6",
"--extra-profile-file=jsreftest/tests/user.js",
],
},
"xpcshell": {
"run_filename": "remotexpcshelltests.py",
"testsdir": "xpcshell",
"options": [
"--dm_trans=adb",
"--xre-path=%(xre_path)s",
"--testing-modules-dir=%(modules_dir)s",
"--apk=%(installer_path)s",
"--no-logfiles",
"--symbols-path=%(symbols_path)s",
"--manifest=tests/xpcshell.ini",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--total-chunks=3",
],
},
"cppunittest": {
"run_filename": "remotecppunittests.py",
"testsdir": "cppunittest",
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(xre_path)s",
"--dm_trans=adb",
"--localBinDir=../bin",
"--apk=%(installer_path)s",
".",
],
},
}, # end suite_definitions
"test_suite_definitions": {
"jsreftest-1": {
"category": "jsreftest",
@ -514,8 +662,6 @@ config = {
"extra_args": [],
},
}, # end of "test_definitions"
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/android_arm_4_3_config.py",
"download_minidump_stackwalk": True,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",

53
testing/mozharness/configs/android/androidx86.py
Просмотреть файл

@ -81,6 +81,57 @@ config = {
"sut_port2": 20706
}
],
"suite_definitions": {
"mochitest": {
"run_filename": "runtestsremote.py",
"options": ["--dm_trans=sut",
"--app=%(app)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--certificate-path=%(certs_path)s",
"--symbols-path=%(symbols_path)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
},
"reftest": {
"run_filename": "remotereftest.py",
"options": ["--app=%(app)s",
"--ignore-window-size",
"--bootstrap",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--utility-path=%(utility_path)s",
"--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--http-port=%(http_port)s",
"--ssl-port=%(ssl_port)s",
"--httpd-path", "%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
],
},
"xpcshell": {
"run_filename": "remotexpcshelltests.py",
"options": ["--deviceIP=%(device_ip)s",
"--devicePort=%(device_port)s",
"--xre-path=%(xre_path)s",
"--testing-modules-dir=%(modules_dir)s",
"--apk=%(installer_path)s",
"--no-logfiles",
"--symbols-path=%(symbols_path)s",
"--manifest=tests/xpcshell.ini",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
],
},
}, # end suite_definitions
"test_suite_definitions": {
"jsreftest": {
"category": "reftest",
@ -125,8 +176,6 @@ config = {
"extra_args": ["--manifest=tests/xpcshell_android.ini"]
},
}, # end of "test_definitions"
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/android_x86_config.py",
"download_minidump_stackwalk": True,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",

37
testing/mozharness/configs/b2g/desktop_automation_config.py
Просмотреть файл

@ -40,6 +40,39 @@ config = {
"mochitest": "runtestsb2g.py",
"reftest": "runreftestb2g.py",
},
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/b2g_desktop_config.py",
"suite_definitions": {
"mochitest": {
"options": [
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--profile=%(gaia_profile)s",
"--app=%(application)s",
"--desktop",
"--utility-path=%(utility_path)s",
"--certificate-path=%(cert_path)s",
"--symbols-path=%(symbols_path)s",
"--browser-arg=%(browser_arg)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
"run_filename": "runtestsb2g.py",
"testsdir": "mochitest"
},
"reftest": {
"options": [
"--desktop",
"--profile=%(gaia_profile)s",
"--appname=%(application)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--browser-arg=%(browser_arg)s",
"--symbols-path=%(symbols_path)s",
"%(test_manifest)s"
],
"run_filename": "runreftestsb2g.py",
"testsdir": "reftest"
}
},
}

140
testing/mozharness/configs/b2g/emulator_automation_config.py
Просмотреть файл

@ -46,7 +46,143 @@ config = {
"xpcshell": "runtestsb2g.py",
"cppunittest": "remotecppunittests.py"
},
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/b2g_emulator_config.py",
"suite_definitions": {
"cppunittest": {
"options": [
"--dm_trans=adb",
"--symbols-path=%(symbols_path)s",
"--xre-path=%(xre_path)s",
"--addEnv",
"LD_LIBRARY_PATH=/vendor/lib:/system/lib:/system/b2g",
"--with-b2g-emulator=%(b2gpath)s",
"."
],
"run_filename": "remotecppunittests.py",
"testsdir": "cppunittest"
},
"crashtest": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--emulator-res=800x1000",
"--logdir=%(logcat_dir)s",
"--remote-webserver=%(remote_webserver)s",
"--ignore-window-size",
"--xre-path=%(xre_path)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"tests/testing/crashtest/crashtests.list"
],
"run_filename": "runreftestb2g.py",
"testsdir": "reftest"
},
"jsreftest": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--emulator-res=800x1000",
"--logdir=%(logcat_dir)s",
"--remote-webserver=%(remote_webserver)s",
"--ignore-window-size",
"--xre-path=%(xre_path)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--extra-profile-file=jsreftest/tests/user.js",
"jsreftest/tests/jstests.list"
],
"run_filename": "remotereftest.py",
"testsdir": "reftest"
},
"mochitest": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--logdir=%(logcat_dir)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--certificate-path=%(certificate_path)s",
"--screenshot-on-fail",
"%(test_path)s"
],
"run_filename": "runtestsb2g.py",
"testsdir": "mochitest"
},
"mochitest-chrome": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--logdir=%(logcat_dir)s",
"--remote-webserver=%(remote_webserver)s",
"--xre-path=%(xre_path)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--quiet",
"--chrome",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--certificate-path=%(certificate_path)s",
"--screenshot-on-fail",
"%(test_path)s"
],
"run_filename": "runtestsb2g.py",
"testsdir": "mochitest"
},
"reftest": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--emulator-res=800x1000",
"--logdir=%(logcat_dir)s",
"--remote-webserver=%(remote_webserver)s",
"--ignore-window-size",
"--xre-path=%(xre_path)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--enable-oop",
"tests/layout/reftests/reftest.list"
],
"run_filename": "runreftestsb2g.py",
"testsdir": "reftest"
},
"xpcshell": {
"options": [
"--adbpath=%(adbpath)s",
"--b2gpath=%(b2gpath)s",
"--emulator=%(emulator)s",
"--logdir=%(logcat_dir)s",
"--manifest=tests/xpcshell.ini",
"--use-device-libs",
"--testing-modules-dir=%(modules_dir)s",
"--symbols-path=%(symbols_path)s",
"--busybox=%(busybox)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
],
"run_filename": "runtestsb2g.py",
"testsdir": "xpcshell"
}
},
"vcs_output_timeout": 1760,
}

15
testing/mozharness/configs/b2g/mulet_config.py
Просмотреть файл

@ -9,5 +9,18 @@ config = {
'install',
'run-tests',
],
"in_tree_config": "config/mozharness/linux_mulet_config.py",
# testsuite options
"reftest_options": [
"--mulet",
"--profile=%(gaia_profile)s",
"--appname=%(application)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s",
"--symbols-path=%(symbols_path)s",
"--enable-oop",
"%(test_manifest)s"
],
"run_file_names": {
"reftest": "runreftestb2g.py",
},
}

26
testing/mozharness/configs/luciddream/linux_config.py
Просмотреть файл

@ -29,7 +29,29 @@ config = {
],
"pip_index": False,
"in_tree_config": "config/mozharness/linux_config.py",
"suite_definitions": {
"luciddream-emulator": {
"options": [
"--startup-timeout=300",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--browser-path=%(browser_path)s",
"--b2gpath=%(emulator_path)s",
"%(test_manifest)s"
],
},
"luciddream-b2gdt": {
"options": [
"--startup-timeout=300",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--browser-path=%(browser_path)s",
"--b2g-desktop-path=%(fxos_desktop_path)s",
"--gaia-profile=%(gaia_profile)s",
"%(test_manifest)s"
],
},
},
"buildbot_json_path": "buildprops.json",
@ -37,8 +59,6 @@ config = {
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
# will handle in-tree config as subsequent patch
# "in_tree_config": "config/mozharness/luciddream.py",
"download_symbols": "ondemand",
"download_minidump_stackwalk": True,
"tooltool_cache": "/builds/tooltool_cache",

88
testing/mozharness/configs/marionette/automation_emulator_config.py
Просмотреть файл

@ -1,6 +1,7 @@
# This is a template config file for marionette production.
import os
HG_SHARE_BASE_DIR = "/builds/hg-shared"
config = {
@ -39,5 +40,90 @@ config = {
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
"in_tree_config": "config/mozharness/marionette.py",
},
"suite_definitions": {
"gaiatest_desktop": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--gecko-log=%(gecko_log)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s"
],
"run_filename": "",
"testsdir": ""
},
"gaiatest_emulator": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_desktop": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"webapi_desktop": {
"options": [],
"run_filename": "",
"testsdir": ""
},
"webapi_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--symbols-path=%(symbols_path)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
}
},
}

87
testing/mozharness/configs/marionette/gaia_ui_test_prod_config.py
Просмотреть файл

@ -2,6 +2,7 @@
import os
import platform
HG_SHARE_BASE_DIR = "/builds/hg-shared"
if platform.system().lower() == 'darwin':
@ -48,6 +49,90 @@ config = {
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
"vcs_output_timeout": 1760,
"in_tree_config": "config/mozharness/marionette.py",
"tooltool_cache": "/builds/tooltool_cache",
"suite_definitions": {
"gaiatest_desktop": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--gecko-log=%(gecko_log)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s"
],
"run_filename": "",
"testsdir": ""
},
"gaiatest_emulator": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_desktop": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"webapi_desktop": {
"options": [],
"run_filename": "",
"testsdir": ""
},
"webapi_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--symbols-path=%(symbols_path)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
}
},
}

86
testing/mozharness/configs/marionette/prod_config.py
Просмотреть файл

@ -36,8 +36,92 @@ config = {
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
"in_tree_config": "config/mozharness/marionette.py",
"download_symbols": "ondemand",
"download_minidump_stackwalk": True,
"tooltool_cache": "/builds/tooltool_cache",
"suite_definitions": {
"gaiatest_desktop": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--gecko-log=%(gecko_log)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s"
],
"run_filename": "",
"testsdir": ""
},
"gaiatest_emulator": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_desktop": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"webapi_desktop": {
"options": [],
"run_filename": "",
"testsdir": ""
},
"webapi_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--symbols-path=%(symbols_path)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
}
},
}

86
testing/mozharness/configs/marionette/test_config.py
Просмотреть файл

@ -17,5 +17,89 @@ config = {
'install',
'run-marionette',
],
"in_tree_config": "config/mozharness/marionette.py",
"suite_definitions": {
"gaiatest_desktop": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--gecko-log=%(gecko_log)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s"
],
"run_filename": "",
"testsdir": ""
},
"gaiatest_emulator": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_desktop": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"webapi_desktop": {
"options": [],
"run_filename": "",
"testsdir": ""
},
"webapi_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--symbols-path=%(symbols_path)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
}
},
}

86
testing/mozharness/configs/marionette/windows_config.py
Просмотреть файл

@ -39,7 +39,91 @@ config = {
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
"in_tree_config": "config/mozharness/marionette.py",
"download_minidump_stackwalk": True,
"download_symbols": "ondemand",
"suite_definitions": {
"gaiatest_desktop": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--gecko-log=%(gecko_log)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--total-chunks=%(total_chunks)s",
"--this-chunk=%(this_chunk)s"
],
"run_filename": "",
"testsdir": ""
},
"gaiatest_emulator": {
"options": [
"--restart",
"--timeout=%(timeout)s",
"--type=%(type)s",
"--testvars=%(testvars)s",
"--profile=%(profile)s",
"--symbols-path=%(symbols_path)s",
"--xml-output=%(xml_output)s",
"--html-output=%(html_output)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_desktop": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--binary=%(binary)s",
"--address=%(address)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"marionette_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "",
"testsdir": ""
},
"webapi_desktop": {
"options": [],
"run_filename": "",
"testsdir": ""
},
"webapi_emulator": {
"options": [
"--type=%(type)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--symbols-path=%(symbols_path)s",
"--logcat-dir=%(logcat_dir)s",
"--emulator=%(emulator)s",
"--homedir=%(homedir)s"
],
"run_filename": "",
"testsdir": ""
}
},
}

112
testing/mozharness/configs/unittests/linux_unittest.py
Просмотреть файл

@ -55,8 +55,116 @@ config = {
"mozbase": ["mozbase/*"],
"mozmill": ["mozmill/*"],
},
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/linux_config.py",
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(abs_app_dir)s"
],
"run_filename": "runcppunittests.py",
"testsdir": "cppunittest"
},
"jittest": {
"options": [
"tests/bin/js",
"--no-slow",
"--no-progress",
"--format=automation",
"--jitflags=all"
],
"run_filename": "jit_test.py",
"testsdir": "jit-test/jit-test"
},
"luciddream-emulator": {
"options": [
"--startup-timeout=300",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--browser-path=%(browser_path)s",
"--b2gpath=%(emulator_path)s",
"%(test_manifest)s"
],
},
"luciddream-b2gdt": {
"options": [
"--startup-timeout=300",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--browser-path=%(browser_path)s",
"--b2g-desktop-path=%(fxos_desktop_path)s",
"--gaia-profile=%(gaia_profile)s",
"%(test_manifest)s"
],
},
"mochitest": {
"options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--setpref=webgl.force-enabled=true",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--use-test-media-devices",
"--screenshot-on-fail",
],
"run_filename": "runtests.py",
"testsdir": "mochitest"
},
"mozbase": {
"options": [
"-b",
"%(binary_path)s"
],
"run_filename": "test.py",
"testsdir": "mozbase"
},
"mozmill": {
"options": [
"--binary=%(binary_path)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "runtestlist.py",
"testsdir": "mozmill"
},
"reftest": {
"options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "runreftest.py",
"testsdir": "reftest"
},
"webapprt": {
"options": [
"--app=%(app_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--console-level=INFO",
"--testing-modules-dir=tests/modules",
"--quiet"
],
"run_filename": "runtests.py",
"testsdir": "mochitest"
},
"xpcshell": {
"options": [
"--symbols-path=%(symbols_path)s",
"--test-plugin-path=%(test_plugin_path)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--utility-path=tests/bin",
],
"run_filename": "runxpcshelltests.py",
"testsdir": "xpcshell"
}
},
# local mochi suites
"all_mochitest_suites": {
"plain1": ["--total-chunks=5", "--this-chunk=1", "--chunk-by-dir=4"],

90
testing/mozharness/configs/unittests/mac_unittest.py
Просмотреть файл

@ -44,8 +44,94 @@ config = {
"mozbase": ["mozbase/*"],
"mozmill": ["mozmill/*"],
},
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/mac_config.py",
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(abs_app_dir)s"
],
"run_filename": "runcppunittests.py",
"testsdir": "cppunittest"
},
"jittest": {
"options": [
"tests/bin/js",
"--no-slow",
"--no-progress",
"--format=automation",
"--jitflags=all"
],
"run_filename": "jit_test.py",
"testsdir": "jit-test/jit-test"
},
"mochitest": {
"options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
"run_filename": "runtests.py",
"testsdir": "mochitest"
},
"mozbase": {
"options": [
"-b",
"%(binary_path)s"
],
"run_filename": "test.py",
"testsdir": "mozbase"
},
"mozmill": {
"options": [
"--binary=%(binary_path)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "runtestlist.py",
"testsdir": "mozmill"
},
"reftest": {
"options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "runreftest.py",
"testsdir": "reftest"
},
"webapprt": {
"options": [
"--app=%(app_path)s",
"--xre-path=%(abs_res_dir)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--console-level=INFO",
"--testing-modules-dir=tests/modules",
"--quiet"
],
"run_filename": "runtests.py",
"testsdir": "mochitest"
},
"xpcshell": {
"options": [
"--symbols-path=%(symbols_path)s",
"--test-plugin-path=%(test_plugin_path)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--utility-path=tests/bin",
],
"run_filename": "runxpcshelltests.py",
"testsdir": "xpcshell"
}
},
# local mochi suites
"all_mochitest_suites": {
"plain1": ["--total-chunks=5", "--this-chunk=1", "--chunk-by-dir=4"],

89
testing/mozharness/configs/unittests/win_unittest.py
Просмотреть файл

@ -53,8 +53,93 @@ config = {
"mozbase": ["mozbase/*"],
"mozmill": ["mozmill/*"],
},
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/windows_config.py",
"suite_definitions": {
"cppunittest": {
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(abs_app_dir)s"
],
"run_filename": "runcppunittests.py",
"testsdir": "cppunittest"
},
"jittest": {
"options": [
"tests/bin/js",
"--no-slow",
"--no-progress",
"--format=automation",
"--jitflags=all"
],
"run_filename": "jit_test.py",
"testsdir": "jit-test/jit-test"
},
"mochitest": {
"options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--quiet",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--screenshot-on-fail",
],
"run_filename": "runtests.py",
"testsdir": "mochitest"
},
"mozbase": {
"options": [
"-b",
"%(binary_path)s"
],
"run_filename": "test.py",
"testsdir": "mozbase"
},
"mozmill": {
"options": [
"--binary=%(binary_path)s",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "runtestlist.py",
"testsdir": "mozmill"
},
"reftest": {
"options": [
"--appname=%(binary_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s"
],
"run_filename": "runreftest.py",
"testsdir": "reftest"
},
"webapprt": {
"options": [
"--app=%(app_path)s",
"--utility-path=tests/bin",
"--extra-profile-file=tests/bin/plugins",
"--symbols-path=%(symbols_path)s",
"--certificate-path=tests/certs",
"--console-level=INFO",
"--testing-modules-dir=tests/modules",
"--quiet"
],
"run_filename": "runtests.py",
"testsdir": "mochitest"
},
"xpcshell": {
"options": [
"--symbols-path=%(symbols_path)s",
"--test-plugin-path=%(test_plugin_path)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--utility-path=tests/bin",
],
"run_filename": "runxpcshelltests.py",
"testsdir": "xpcshell"
}
},
# local mochi suites
"all_mochitest_suites":
{

13
testing/mozharness/configs/web_platform_tests/prod_config.py
Просмотреть файл

@ -6,10 +6,15 @@
import os
config = {
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/web_platform_tests_config.py",
"options": [],
"options": [
"--prefs-root=%(test_path)s/prefs",
"--processes=1",
"--config=%(test_path)s/wptrunner.ini",
"--ca-cert-path=%(test_path)s/certs/cacert.pem",
"--host-key-path=%(test_path)s/certs/web-platform.test.key",
"--host-cert-path=%(test_path)s/certs/web-platform.test.pem",
"--certutil-binary=%(test_install_path)s/bin/certutil",
],
"exes": {
'python': '/tools/buildbot/bin/python',

13
testing/mozharness/configs/web_platform_tests/prod_config_windows.py
Просмотреть файл

@ -10,8 +10,15 @@ import os
import sys
config = {
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/web_platform_tests_config.py",
"options": [
"--prefs-root=%(test_path)s/prefs",
"--processes=1",
"--config=%(test_path)s/wptrunner.ini",
"--ca-cert-path=%(test_path)s/certs/cacert.pem",
"--host-key-path=%(test_path)s/certs/web-platform.test.key",
"--host-cert-path=%(test_path)s/certs/web-platform.test.pem",
"--certutil-binary=%(test_install_path)s/bin/certutil",
],
"exes": {
'python': sys.executable,
@ -22,8 +29,6 @@ config = {
'tooltool.py': [sys.executable, 'C:/mozilla-build/tooltool.py'],
},
"options": [],
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",

13
testing/mozharness/configs/web_platform_tests/test_config.py
Просмотреть файл

@ -5,10 +5,15 @@
# ***** END LICENSE BLOCK *****
config = {
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/web_platform_tests_config.py",
"options": [],
"options": [
"--prefs-root=%(test_path)s/prefs",
"--processes=1",
"--config=%(test_path)s/wptrunner.ini",
"--ca-cert-path=%(test_path)s/certs/cacert.pem",
"--host-key-path=%(test_path)s/certs/web-platform.test.key",
"--host-cert-path=%(test_path)s/certs/web-platform.test.pem",
"--certutil-binary=%(test_install_path)s/bin/certutil",
],
"default_actions": [
'clobber',

13
testing/mozharness/configs/web_platform_tests/test_config_windows.py
Просмотреть файл

@ -8,8 +8,15 @@ import os
import sys
config = {
# test harness options are located in the gecko tree
"in_tree_config": "config/mozharness/web_platform_tests_config.py",
"options": [
"--prefs-root=%(test_path)s/prefs",
"--processes=1",
"--config=%(test_path)s/wptrunner.ini",
"--ca-cert-path=%(test_path)s/certs/cacert.pem",
"--host-key-path=%(test_path)s/certs/web-platform.test.key",
"--host-cert-path=%(test_path)s/certs/web-platform.test.pem",
"--certutil-binary=%(test_install_path)s/bin/certutil",
],
"exes": {
'python': sys.executable,
@ -19,8 +26,6 @@ config = {
'%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],
},
"options": [],
"default_actions": [
'clobber',
'download-and-extract',

51
testing/mozharness/mozharness/mozilla/testing/testbase.py
Просмотреть файл

@ -99,7 +99,6 @@ class TestingMixin(VirtualenvMixin, BuildbotMixin, ResourceMonitoringMixin, Tool
test_url = None
test_packages_url = None
test_zip_path = None
tree_config = ReadOnlyDict({})
symbols_url = None
symbols_path = None
jsshell_url = None
@ -134,13 +133,6 @@ class TestingMixin(VirtualenvMixin, BuildbotMixin, ResourceMonitoringMixin, Tool
else:
return self.download_proxied_file(*args, **kwargs)
def query_value(self, key):
"""
This function allows us to check for a value
in the self.tree_config first and then on self.config
"""
return self.tree_config.get(key, self.config.get(key))
def query_build_dir_url(self, file_name):
"""
Resolve a file name to a potential url in the build upload directory where
@ -451,47 +443,13 @@ You can set this by:
halt_on_failure=True, success_codes=[0, 11],
fatal_exit_code=3)
def _read_tree_config(self):
"""Reads an in-tree config file"""
dirs = self.query_abs_dirs()
test_install_dir = dirs.get('abs_test_install_dir',
os.path.join(dirs['abs_work_dir'], 'tests'))
if 'in_tree_config' in self.config:
rel_tree_config_path = self.config['in_tree_config']
tree_config_path = os.path.join(test_install_dir, rel_tree_config_path)
if not os.path.isfile(tree_config_path):
self.fatal("The in-tree configuration file '%s' does not exist!"
"It must be added to '%s'. See bug 1035551 for more details." %
(tree_config_path, os.path.join('gecko', 'testing', rel_tree_config_path)))
try:
self.tree_config.update(parse_config_file(tree_config_path))
except:
msg = "There was a problem parsing the in-tree configuration file '%s'!" % \
os.path.join('gecko', 'testing', rel_tree_config_path)
self.exception(message=msg, level=FATAL)
self.dump_config(file_path=os.path.join(dirs['abs_log_dir'], 'treeconfig.json'),
config=self.tree_config)
if (self.buildbot_config and 'properties' in self.buildbot_config and
self.buildbot_config['properties'].get('branch') == 'try'):
try_config_path = os.path.join(test_install_dir, 'config', 'mozharness',
'try_arguments.py')
known_try_arguments = parse_config_file(try_config_path)
self.set_extra_try_arguments(known_try_arguments)
self.tree_config.lock()
def structured_output(self, suite_category):
"""Defines whether structured logging is in use in this configuration. This
may need to be replaced with data from a different config at the resolution
of bug 1070041 and related bugs.
"""
return ('structured_suites' in self.tree_config and
suite_category in self.tree_config['structured_suites'])
return ('structured_suites' in self.config and
suite_category in self.config['structured_suites'])
def get_test_output_parser(self, suite_category, strict=False,
fallback_parser_class=DesktopUnittestOutputParser,
@ -572,7 +530,6 @@ You can set this by:
suite_categories = suite_categories or ['common']
self._download_test_packages(suite_categories, target_unzip_dirs)
self._read_tree_config()
self._download_installer()
if self.config.get('download_symbols'):
self._download_and_extract_symbols()
@ -732,10 +689,6 @@ Did you run with --create-virtualenv? Is mozinstall in virtualenv_modules?""")
def preflight_run_tests(self):
"""preflight commands for all tests"""
# If the in tree config hasn't been loaded by a previous step, load it here.
if len(self.tree_config) == 0:
self._read_tree_config()
c = self.config
if c.get('run_cmd_checks_enabled'):
self._run_cmd_checks(c.get('preflight_run_cmd_suites', []))

17
testing/mozharness/mozharness/mozilla/testing/try_tools.py
Просмотреть файл

@ -9,6 +9,7 @@ import argparse
import os
import re
from mozharness.base.script import PostScriptAction
from mozharness.base.transfer import TransferMixin
@ -18,6 +19,13 @@ class TryToolsMixin(TransferMixin):
harness_extra_args = None
try_test_paths = []
known_try_arguments = {
'--tag': {
'action': 'append',
'dest': 'tags',
'default': None,
},
}
def _extract_try_message(self):
msg = self.buildbot_config['sourcestamp']['changes'][-1]['comments']
@ -41,12 +49,17 @@ class TryToolsMixin(TransferMixin):
return msg
def set_extra_try_arguments(self, known_try_arguments):
@PostScriptAction('download-and-extract')
def _set_extra_try_arguments(self, action, success=None):
"""Finds a commit message and parses it for extra arguments to pass to the test
harness command line and test paths used to filter manifests.
Extracting arguments from a commit message taken directly from the try_parser.
"""
if (not self.buildbot_config or 'properties' not in self.buildbot_config or
self.buildbot_config['properties'].get('branch') != 'try'):
return
msg = self._extract_try_message()
if not msg:
return
@ -79,7 +92,7 @@ class TryToolsMixin(TransferMixin):
return label_dict[val]
return '--%s' % val.replace('_', '-')
for label, opts in known_try_arguments.iteritems():
for label, opts in self.known_try_arguments.iteritems():
if 'action' in opts and opts['action'] not in ('append', 'store',
'store_true', 'store_false'):
self.fatal('Try syntax does not support passing custom or store_const '

13
testing/mozharness/scripts/android_emulator_unittest.py
Просмотреть файл

@ -123,7 +123,7 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
dirs = self.query_abs_dirs()
suite_category = self.test_suite_definitions[self.test_suite]["category"]
try:
test_dir = self.tree_config["suite_definitions"][suite_category]["testsdir"]
test_dir = self.config["suite_definitions"][suite_category]["testsdir"]
except:
test_dir = suite_category
return os.path.join(dirs['abs_test_install_dir'], test_dir)
@ -434,16 +434,15 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
dirs = self.query_abs_dirs()
suite_category = self.test_suite_definitions[self.test_suite]["category"]
if suite_category not in self.tree_config["suite_definitions"]:
self.fatal("Key '%s' not defined in the in-tree config! Please add it to '%s'. "
"See bug 981030 for more details." % (suite_category,
os.path.join('gecko', 'testing', self.config['in_tree_config'])))
if suite_category not in self.config["suite_definitions"]:
self.fatal("Key '%s' not defined in the config!" % suite_category)
cmd = [
self.query_python_path('python'),
'-u',
os.path.join(
self._query_tests_dir(),
self.tree_config["suite_definitions"][suite_category]["run_filename"]
self.config["suite_definitions"][suite_category]["run_filename"]
),
]
@ -474,7 +473,7 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
'device_ip': c['device_ip'],
'device_port': str(self.emulator['sut_port1']),
})
for option in self.tree_config["suite_definitions"][suite_category]["options"]:
for option in self.config["suite_definitions"][suite_category]["options"]:
cmd.extend([option % str_format_values])
for arg in self.test_suite_definitions[self.test_suite]["extra_args"]:

16
testing/mozharness/scripts/android_panda.py
Просмотреть файл

@ -432,7 +432,7 @@ class PandaTest(TestingMixin, MercurialScript, BlobUploadMixin, MozpoolMixin, Bu
c = self.config
dirs = self.query_abs_dirs()
options = []
run_file = self.tree_config["suite_definitions"][suite_category]["run_filename"]
run_file = c["suite_definitions"][suite_category]["run_filename"]
base_cmd = ['python', '-u']
base_cmd.append(os.path.join((dirs["abs_%s_dir" % suite_category]), run_file))
self.device_ip = socket.gethostbyname(self.mozpool_device)
@ -472,14 +472,9 @@ class PandaTest(TestingMixin, MercurialScript, BlobUploadMixin, MozpoolMixin, Bu
'raw_log_file': raw_log_file,
'error_summary_file': error_summary_file,
}
if '%s_options' % suite_category in self.tree_config:
for option in self.tree_config['%s_options' % suite_category]:
options.append(option % str_format_values)
abs_base_cmd = base_cmd + options
return abs_base_cmd
elif "suite_definitions" in self.tree_config and \
suite_category in self.tree_config["suite_definitions"]: # new in-tree format
for option in self.tree_config["suite_definitions"][suite_category]["options"]:
if "suite_definitions" in c and \
suite_category in c["suite_definitions"]: # new in-tree format
for option in c["suite_definitions"][suite_category]["options"]:
options.append(option % str_format_values)
abs_base_cmd = base_cmd + options
return abs_base_cmd
@ -487,8 +482,7 @@ class PandaTest(TestingMixin, MercurialScript, BlobUploadMixin, MozpoolMixin, Bu
self.warning("Suite options for %s could not be determined."
"\nIf you meant to have options for this suite, "
"please make sure they are specified in your "
"tree config under %s_options" %
(suite_category, suite_category))
"config." % suite_category)
###### helper methods
def _pre_config_lock(self, rw_config):

13
testing/mozharness/scripts/androidx86_emulator_unittest.py
Просмотреть файл

@ -124,7 +124,7 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
dirs = self.query_abs_dirs()
suite_category = self.test_suite_definitions[suite_name]["category"]
try:
test_dir = self.tree_config["suite_definitions"][suite_category]["testsdir"]
test_dir = self.config["suite_definitions"][suite_category]["testsdir"]
except:
test_dir = suite_category
@ -404,16 +404,15 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
dirs = self.query_abs_dirs()
suite_category = self.test_suite_definitions[suite_name]["category"]
if suite_category not in self.tree_config["suite_definitions"]:
self.fatal("Key '%s' not defined in the in-tree config! Please add it to '%s'. "
"See bug 981030 for more details." % (suite_category,
os.path.join('gecko', 'testing', self.config['in_tree_config'])))
if suite_category not in c["suite_definitions"]:
self.fatal("Key '%s' not defined in the config!" % suite_category)
cmd = [
self.query_python_path('python'),
'-u',
os.path.join(
self._query_tests_dir(suite_name),
self.tree_config["suite_definitions"][suite_category]["run_filename"]
c["suite_definitions"][suite_category]["run_filename"]
),
]
@ -443,7 +442,7 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin
'device_ip': c['device_ip'],
'device_port': str(emulator['sut_port1']),
})
for option in self.tree_config["suite_definitions"][suite_category]["options"]:
for option in c["suite_definitions"][suite_category]["options"]:
cmd.extend([option % str_format_values])
for arg in self.test_suite_definitions[suite_name]["extra_args"]:

31
testing/mozharness/scripts/b2g_desktop_unittest.py
Просмотреть файл

@ -124,16 +124,6 @@ class B2GDesktopTest(BlobUploadMixin, TestingMixin, MercurialScript):
@PreScriptAction('create-virtualenv')
def _pre_create_virtualenv(self, action):
if self.tree_config.get('use_puppetagain_packages'):
requirements = [os.path.join('tests', 'b2g',
'b2g-unittest-requirements.txt')]
self.register_virtualenv_module('mozinstall',
requirements=requirements)
self.register_virtualenv_module('marionette',
url=os.path.join('tests', 'marionette'), requirements=requirements)
return
dirs = self.query_abs_dirs()
requirements = os.path.join(dirs['abs_config_dir'],
'marionette_requirements.txt')
@ -143,7 +133,7 @@ class B2GDesktopTest(BlobUploadMixin, TestingMixin, MercurialScript):
def _query_abs_base_cmd(self, suite):
dirs = self.query_abs_dirs()
cmd = [self.query_python_path('python')]
cmd.append(self.query_value("run_file_names")[suite])
cmd.append(self.config["run_file_names"][suite])
raw_log_file = os.path.join(dirs['abs_blob_upload_dir'],
'%s_raw.log' % suite)
@ -163,23 +153,10 @@ class B2GDesktopTest(BlobUploadMixin, TestingMixin, MercurialScript):
'error_summary_file': error_summary_file,
}
missing_key = True
if "suite_definitions" in self.tree_config: # new structure
if suite in self.tree_config["suite_definitions"]:
missing_key = False
options = self.tree_config["suite_definitions"][suite]["options"]
else:
suite_options = '%s_options' % suite
if suite_options in self.tree_config:
missing_key = False
options = self.tree_config[suite_options]
if missing_key:
self.fatal("'%s' not defined in the in-tree config! Please add it to '%s'. "
"See bug 981030 for more details." %
(suite,
os.path.join('gecko', 'testing', self.config['in_tree_config'])))
if suite not in self.config["suite_definitions"]:
self.fatal("'%s' not defined in the config!" % suite),
options = self.config["suite_definitions"][suite]["options"]
if options:
for option in options:
option = option % str_format_values

33
testing/mozharness/scripts/b2g_emulator_unittest.py
Просмотреть файл

@ -212,21 +212,6 @@ class B2GEmulatorTest(TestingMixin, VCSMixin, BaseScript, BlobUploadMixin):
@PreScriptAction('create-virtualenv')
def _pre_create_virtualenv(self, action):
if self.tree_config.get('use_puppetagain_packages'):
requirements = [os.path.join('tests', 'b2g',
'b2g-unittest-requirements.txt')]
self.register_virtualenv_module(
'mozinstall',
requirements=requirements
)
self.register_virtualenv_module(
'marionette',
url=os.path.join('tests', 'marionette'),
requirements=requirements
)
return
dirs = self.query_abs_dirs()
requirements = os.path.join(dirs['abs_test_install_dir'],
'config',
@ -286,22 +271,10 @@ class B2GEmulatorTest(TestingMixin, VCSMixin, BaseScript, BlobUploadMixin):
'error_summary_file': error_summary_file,
}
missing_key = True
if "suite_definitions" in self.tree_config: # new structure
if suite in self.tree_config["suite_definitions"]:
missing_key = False
options = self.tree_config["suite_definitions"][suite]["options"]
else:
suite_options = '%s_options' % suite
if suite_options in self.tree_config:
missing_key = False
options = self.tree_config[suite_options]
if missing_key:
self.fatal("Key '%s' not defined in the in-tree config! Please add it to '%s'." \
"See bug 981030 for more details." % (suite,
os.path.join('gecko', 'testing', self.config['in_tree_config'])))
if suite not in self.config["suite_definitions"]:
self.fatal("Key '%s' not defined in the config!" % suite)
options = self.config["suite_definitions"][suite]["options"]
if options:
for option in options:
option = option % str_format_values

21
testing/mozharness/scripts/desktop_unittest.py
Просмотреть файл

@ -246,7 +246,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
abs_app_dir = self.query_abs_app_dir()
if self._is_darwin():
res_subdir = self.tree_config.get("mac_res_subdir", "Resources")
res_subdir = self.config.get("mac_res_subdir", "Resources")
self.abs_res_dir = os.path.join(os.path.dirname(abs_app_dir), res_subdir)
else:
self.abs_res_dir = abs_app_dir
@ -368,23 +368,10 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
abs_res_plugins_dir = os.path.join(abs_res_dir, 'plugins')
str_format_values['test_plugin_path'] = abs_res_plugins_dir
missing_key = True
if "suite_definitions" in self.tree_config: # new structure
if suite_category in self.tree_config["suite_definitions"]:
missing_key = False
options = self.tree_config["suite_definitions"][suite_category]["options"]
else:
suite_options = '%s_options' % suite_category
if suite_options in self.tree_config:
missing_key = False
options = self.tree_config[suite_options]
if missing_key:
self.fatal("'%s' not defined in the in-tree config! Please add it to '%s'. "
"See bug 981030 for more details." %
(suite_category,
os.path.join('gecko', 'testing', self.config['in_tree_config'])))
if suite_category not in c["suite_definitions"]:
self.fatal("'%s' not defined in the config!")
options = c["suite_definitions"][suite_category]["options"]
if options:
for option in options:
option = option % str_format_values

2
testing/mozharness/scripts/luciddream_unittest.py
Просмотреть файл

@ -250,7 +250,7 @@ class LuciddreamTest(TestingMixin, MercurialScript, MozbaseMixin, BaseScript,
str_format_values['gaia_profile'] = os.path.join(dirs['abs_gaia_dir'], 'profile')
suite = 'luciddream-emulator' if self.config.get('emulator_url') else 'luciddream-b2gdt'
options = self.tree_config['suite_definitions'][suite]['options']
options = self.config['suite_definitions'][suite]['options']
for option in options:
option = option % str_format_values
if not option.endswith('None'):

42
testing/mozharness/scripts/marionette.py
Просмотреть файл

@ -226,18 +226,6 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix
@PreScriptAction('create-virtualenv')
def _configure_marionette_virtualenv(self, action):
# XXX Bug 981030 - hack to unbreak b2g18. Remove when b2g18 no longer supported
try:
branch = self.buildbot_config['properties']['branch']
except:
branch = None
if self.tree_config.get('use_puppetagain_packages') or branch in ('mozilla-b2g18', 'mozilla-b2g18_v1_1_0_hd'):
self.register_virtualenv_module('mozinstall')
self.register_virtualenv_module(
'marionette', os.path.join('tests', 'marionette'))
return
dirs = self.query_abs_dirs()
requirements = os.path.join(dirs['abs_test_install_dir'],
'config',
@ -307,7 +295,7 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix
# tests. This method will need to change if this does.
if is_emulator and not is_gaiatest:
testsuite = 'webapi'
return '_'.join([testsuite, platform, 'options'])
return '{}_{}'.format(testsuite, platform)
def download_and_extract(self):
super(MarionetteTest, self).download_and_extract()
@ -328,12 +316,6 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix
else:
super(MarionetteTest, self).install()
def preflight_run_marionette(self):
"""preflight commands for all tests"""
# If the in tree config hasn't been loaded by a previous step, load it here.
if not self.tree_config:
self._read_tree_config()
def run_marionette(self):
"""
Run the Marionette tests
@ -440,23 +422,17 @@ class MarionetteTest(TestingMixin, MercurialScript, BlobUploadMixin, TransferMix
cmd.append('--gecko-log=%s' % os.path.join(dirs["abs_blob_upload_dir"],
'gecko.log'))
options_group = self._get_options_group(self.config.get('emulator'),
self.config.get('gaiatest'))
if self.config.get("structured_output"):
config_fmt_args["raw_log_file"]= "-"
if options_group not in self.tree_config:
# This allows using the new in-tree format
options_group = options_group.split("_options")[0]
if options_group not in self.tree_config["suite_definitions"]:
self.fatal("%s is not defined in the in-tree config" %
options_group)
for s in self.tree_config["suite_definitions"][options_group]["options"]:
cmd.append(s % config_fmt_args)
else:
for s in self.tree_config[options_group]:
cmd.append(s % config_fmt_args)
options_group = self._get_options_group(self.config.get('emulator'),
self.config.get('gaiatest'))
if options_group not in self.config["suite_definitions"]:
self.fatal("%s is not defined in the config!" % options_group)
for s in self.config["suite_definitions"][options_group]["options"]:
cmd.append(s % config_fmt_args)
if self.mkdir_p(dirs["abs_blob_upload_dir"]) == -1:
# Make sure that the logging directory exists

5
testing/mozharness/scripts/mulet_unittest.py
Просмотреть файл

@ -59,11 +59,6 @@ class MuletUnittest(B2GDesktopTest, GaiaMixin, TransferMixin):
if not self.binary_path:
self.fatal("Use --binary-path as it is needed for _query_abs_dir().")
# This is if we don't run all actions since we set this inside
# of download-and-extract()
if not self.tree_config:
self._read_tree_config()
def run_tests(self):
"""
Run the unit test suite.

2
testing/mozharness/scripts/web_platform_tests.py
Просмотреть файл

@ -133,7 +133,7 @@ class WebPlatformTest(TestingMixin, MercurialScript, BlobUploadMixin):
if val:
base_cmd.append("--%s=%s" % (opt.replace("_", "-"), val))
options = list(c.get("options", [])) + list(self.tree_config["options"])
options = list(c.get("options", []))
str_format_values = {
'binary_path': self.binary_path,