Issue #1053 - Part 1c: Remove references to mobile/android targets and paths

pull/24/head
Moonchild 2 years ago committed by roytam1
parent 659441da45
commit b21588597c
  1. 22
      .eslintignore
  2. 3
      .gitignore
  3. 31
      accessible/jsat/AccessFu.jsm
  4. 4
      accessible/jsat/Gestures.jsm
  5. 1
      accessible/jsat/Presentation.jsm
  6. 4
      accessible/jsat/Utils.jsm
  7. 2
      dom/base/ScreenOrientation.h
  8. 4
      modules/libpref/goanna.js
  9. 56
      settings.gradle
  10. 13
      testing/instrumentation/Makefile.in
  11. 16
      testing/mochitest/Makefile.in
  12. 21
      testing/mochitest/mach_test_package_commands.py
  13. 459
      testing/mozharness/configs/android/androidarm.py
  14. 10
      testing/mozharness/configs/android/androidarm_4_3-tc.py
  15. 383
      testing/mozharness/configs/android/androidarm_4_3.py
  16. 9
      testing/mozharness/configs/android/androidarm_dev.py
  17. 73
      testing/mozharness/configs/android/androidx86-tc.py
  18. 182
      testing/mozharness/configs/android/androidx86.py
  19. 111
      testing/mozharness/configs/builds/releng_base_android_64_builds.py
  20. 8
      testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15.py
  21. 9
      testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_debug.py
  22. 18
      testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py
  23. 21
      testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_dependencies.py
  24. 9
      testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_partner_sample1.py
  25. 11
      testing/mozharness/configs/builds/releng_sub_android_configs/64_checkstyle.py
  26. 11
      testing/mozharness/configs/builds/releng_sub_android_configs/64_lint.py
  27. 11
      testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
  28. 8
      testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
  29. 83
      testing/mozharness/configs/merge_day/aurora_to_beta.py
  30. 53
      testing/mozharness/configs/merge_day/beta_to_release.py
  31. 24
      testing/mozharness/configs/merge_day/bump_esr.py
  32. 100
      testing/mozharness/configs/merge_day/central_to_aurora.py
  33. 54
      testing/mozharness/configs/merge_day/release_to_esr.py
  34. 22
      testing/mozharness/configs/merge_day/staging_beta_migration.py
  35. 5
      testing/mozharness/configs/multi_locale/android-mozharness-build.json
  36. 28
      testing/mozharness/configs/multi_locale/ash_android-x86.json
  37. 27
      testing/mozharness/configs/multi_locale/ash_android.json
  38. 2
      testing/mozharness/configs/multi_locale/b2g_linux32.py
  39. 2
      testing/mozharness/configs/multi_locale/b2g_linux64.py
  40. 2
      testing/mozharness/configs/multi_locale/b2g_macosx64.py
  41. 8
      testing/mozharness/configs/multi_locale/b2g_win32.py
  42. 28
      testing/mozharness/configs/multi_locale/mozilla-aurora_android-armv6.json
  43. 28
      testing/mozharness/configs/multi_locale/mozilla-aurora_android-x86.json
  44. 27
      testing/mozharness/configs/multi_locale/mozilla-aurora_android.json
  45. 28
      testing/mozharness/configs/multi_locale/mozilla-beta_android-armv6.json
  46. 28
      testing/mozharness/configs/multi_locale/mozilla-beta_android-x86.json
  47. 27
      testing/mozharness/configs/multi_locale/mozilla-beta_android.json
  48. 28
      testing/mozharness/configs/multi_locale/mozilla-central_android-armv6.json
  49. 28
      testing/mozharness/configs/multi_locale/mozilla-central_android-x86.json
  50. 27
      testing/mozharness/configs/multi_locale/mozilla-central_android.json
  51. 28
      testing/mozharness/configs/multi_locale/mozilla-release_android-armv6.json
  52. 28
      testing/mozharness/configs/multi_locale/mozilla-release_android-x86.json
  53. 27
      testing/mozharness/configs/multi_locale/mozilla-release_android.json
  54. 34
      testing/mozharness/configs/multi_locale/release_mozilla-beta_android-armv6.json
  55. 34
      testing/mozharness/configs/multi_locale/release_mozilla-beta_android-x86.json
  56. 33
      testing/mozharness/configs/multi_locale/release_mozilla-beta_android.json
  57. 34
      testing/mozharness/configs/multi_locale/release_mozilla-release_android-armv6.json
  58. 34
      testing/mozharness/configs/multi_locale/release_mozilla-release_android-x86.json
  59. 33
      testing/mozharness/configs/multi_locale/release_mozilla-release_android.json
  60. 34
      testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-armv6.json
  61. 34
      testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android-x86.json
  62. 33
      testing/mozharness/configs/multi_locale/staging_release_mozilla-beta_android.json
  63. 34
      testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-armv6.json
  64. 34
      testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android-x86.json
  65. 33
      testing/mozharness/configs/multi_locale/staging_release_mozilla-release_android.json
  66. 49
      testing/mozharness/configs/multi_locale/standalone_mozilla-central.py
  67. 47
      testing/mozharness/configs/partner_repacks/release_mozilla-release_android.py
  68. 52
      testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_android.py
  69. 22
      testing/mozharness/configs/releases/bouncer_fennec.py
  70. 3
      testing/mozharness/configs/servo/mac.py
  71. 97
      testing/mozharness/configs/single_locale/ash_android-api-15.py
  72. 97
      testing/mozharness/configs/single_locale/mozilla-aurora_android-api-15.py
  73. 97
      testing/mozharness/configs/single_locale/mozilla-central_android-api-15.py
  74. 97
      testing/mozharness/configs/single_locale/release_mozilla-beta_android_api_15.py
  75. 97
      testing/mozharness/configs/single_locale/release_mozilla-release_android_api_15.py
  76. 97
      testing/mozharness/configs/single_locale/staging_release_mozilla-beta_android_api_15.py
  77. 97
      testing/mozharness/configs/single_locale/staging_release_mozilla-release_android_api_15.py
  78. 18
      testing/mozharness/configs/single_locale/tc_android-api-15.py
  79. 97
      testing/mozharness/configs/single_locale/try_android-api-15.py
  80. 21
      testing/testsuite-targets.mk

@ -187,28 +187,6 @@ devtools/client/framework/test/code_ugly*
devtools/server/tests/unit/babel_and_browserify_script_with_source_map.js
devtools/server/tests/unit/setBreakpoint*
# mobile/android/ exclusions
mobile/android/tests/
# Uses `#filter substitution`
mobile/android/b2gdroid/app/b2gdroid.js
mobile/android/app/mobile.js
mobile/android/chrome/content/healthreport-prefs.js
# Uses `#expand`
mobile/android/chrome/content/about.js
# Not much JS to lint and non-standard at that
mobile/android/installer/
mobile/android/locales/
# Non-standard `(catch ex if ...)`
mobile/android/chrome/content/browser.js
mobile/android/components/Snippets.js
# Bug 1178739: Ignore this file as a quick fix for "Illegal yield expression"
mobile/android/modules/HomeProvider.jsm
# services/ exclusions
# Uses `#filter substitution`

3
.gitignore vendored

@ -91,9 +91,6 @@ GPATH
# Git clone directory for updating web-platform-tests
testing/web-platform/sync/
# Android Gradle artifacts.
mobile/android/gradle/.gradle
# XCode project cruft
embedding/ios/GoannaEmbed/GoannaEmbed.xcodeproj/project.xcworkspace/xcuserdata
embedding/ios/GoannaEmbed/GoannaEmbed.xcodeproj/xcuserdata

@ -64,9 +64,7 @@ this.AccessFu = { // jshint ignore:line
if (this._enabled) {
this._disable();
}
if (Utils.MozBuildApp === 'mobile/android') {
Services.obs.removeObserver(this, 'Accessibility:Settings');
} else if (Utils.win.navigator.mozSettings) {
if (Utils.win.navigator.mozSettings) {
Utils.win.navigator.mozSettings.removeObserver(
SCREENREADER_SETTING, this.handleEvent);
}
@ -585,11 +583,7 @@ var Output = {
get androidBridge() {
delete this.androidBridge;
if (Utils.MozBuildApp === 'mobile/android') {
this.androidBridge = Services.androidBridge;
} else {
this.androidBridge = null;
}
this.androidBridge = null;
return this.androidBridge;
},
@ -815,12 +809,6 @@ var Input = {
target.blur();
}
}
if (Utils.MozBuildApp == 'mobile/android') {
// Return focus to native Android browser chrome.
Services.androidBridge.handleGeckoMessage(
{ type: 'ToggleChrome:Focus' });
}
break;
case aEvent.DOM_VK_RETURN:
if (this.editState.editing) {
@ -837,18 +825,9 @@ var Input = {
},
moveToPoint: function moveToPoint(aRule, aX, aY) {
// XXX: Bug 1013408 - There is no alignment between the chrome window's
// viewport size and the content viewport size in Android. This makes
// sending mouse events beyond its bounds impossible.
if (Utils.MozBuildApp === 'mobile/android') {
let mm = Utils.getMessageManager(Utils.CurrentBrowser);
mm.sendAsyncMessage('AccessFu:MoveToPoint',
{rule: aRule, x: aX, y: aY, origin: 'top'});
} else {
let win = Utils.win;
Utils.winUtils.sendMouseEvent('mousemove',
aX - win.mozInnerScreenX, aY - win.mozInnerScreenY, 0, 0, 0);
}
let win = Utils.win;
Utils.winUtils.sendMouseEvent('mousemove',
aX - win.mozInnerScreenX, aY - win.mozInnerScreenY, 0, 0, 0);
},
moveCursor: function moveCursor(aAction, aRule, aInputType, aAdjustRange) {

@ -76,8 +76,6 @@ const EDGE = 0.1;
const TIMEOUT_MULTIPLIER = 1;
// A single pointer down/up sequence periodically precedes the tripple swipe
// gesture on Android. This delay acounts for that.
const IS_ANDROID = Utils.MozBuildApp === 'mobile/android' &&
Utils.AndroidSdkVersion >= 14;
/**
* A point object containing distance travelled data.
@ -206,7 +204,7 @@ this.GestureTracker = { // jshint ignore:line
if (aDetail.type !== 'pointerdown') {
return;
}
let GestureConstructor = aGesture || (IS_ANDROID ? DoubleTap : Tap);
let GestureConstructor = aGesture || Tap;
this._create(GestureConstructor);
this._update(aDetail, aTimeStamp);
},

@ -680,7 +680,6 @@ this.Presentation = { // jshint ignore:line
get presenters() {
delete this.presenters;
let presenterMap = {
'mobile/android': [VisualPresenter, AndroidPresenter],
'b2g': [VisualPresenter, B2GPresenter],
'browser': [VisualPresenter, B2GPresenter, AndroidPresenter]
};

@ -33,9 +33,7 @@ this.Utils = { // jshint ignore:line
_buildAppMap: {
'{3c2e2abc-06d4-11e1-ac3b-374f68613e61}': 'b2g',
'{d1bfe7d9-c01e-4237-998b-7b5f960a4314}': 'graphene',
'{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'browser',
'{aa3c5121-dab2-40e2-81ca-7ea25febc110}': 'mobile/android',
'{a23983c0-fd0e-11dc-95ff-0800200c9a66}': 'mobile/xul'
'{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'browser'
},
init: function Utils_init(aWindow) {

@ -16,8 +16,6 @@ namespace mozilla {
namespace dom {
class Promise;
// Make sure that any change to ScreenOrientationInternal values are
// also made in mobile/android/base/GeckoScreenOrientation.java
typedef uint32_t ScreenOrientationInternal;
static const ScreenOrientationInternal eScreenOrientation_None = 0;

@ -4,9 +4,5 @@
#include ../../toolkit/components/telemetry/datareporting-prefs.js
#endif
#ifdef MOZ_SERVICES_HEALTHREPORT
#if MOZ_WIDGET_TOOLKIT == android
#include ../../mobile/android/chrome/content/healthreport-prefs.js
#else
#include ../../toolkit/components/telemetry/healthreport-prefs.js
#endif
#endif

@ -1,55 +1 @@
// You might think topsrcdir is '.', but that's not true when the Gradle build
// is launched from within IntelliJ.
def topsrcdir = rootProject.projectDir.absolutePath
def commandLine = ["${topsrcdir}/mach", "environment", "--format", "json", "--verbose"]
def proc = commandLine.execute(null, new File(topsrcdir))
def standardOutput = new ByteArrayOutputStream()
proc.consumeProcessOutput(standardOutput, standardOutput)
proc.waitFor()
// Only show the output if something went wrong.
if (proc.exitValue() != 0) {
throw new GradleException("Process '${commandLine}' finished with non-zero exit value ${proc.exitValue()}:\n\n${standardOutput.toString()}")
}
import groovy.json.JsonSlurper
def slurper = new JsonSlurper()
def json = slurper.parseText(standardOutput.toString())
if (json.substs.MOZ_BUILD_APP != 'mobile/android') {
throw new GradleException("Building with Gradle is only supported for Fennec, i.e., MOZ_BUILD_APP == 'mobile/android'.")
}
// Set the Android SDK location. This is the *least specific* mechanism, which
// is unfortunate: we'd prefer to use the *most specific* mechanism. That is,
// local.properties (first 'sdk.dir', then 'android.dir') and then the
// environment variable ANDROID_HOME will override this. That's unfortunate,
// but it's hard to automatically arrange better.
System.setProperty('android.home', json.substs.ANDROID_SDK_ROOT)
include ':app'
include ':geckoview'
include ':geckoview_example'
include ':omnijar'
include ':thirdparty'
project(':app').projectDir = new File("${json.topsrcdir}/mobile/android/app")
project(':geckoview').projectDir = new File("${json.topsrcdir}/mobile/android/geckoview")
project(':geckoview_example').projectDir = new File("${json.topsrcdir}/mobile/android/geckoview_example")
project(':omnijar').projectDir = new File("${json.topsrcdir}/mobile/android/app/omnijar")
project(':thirdparty').projectDir = new File("${json.topsrcdir}/mobile/android/thirdparty")
if (json.substs.MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER) {
include ':bouncer'
project(':bouncer').projectDir = new File("${json.topsrcdir}/mobile/android/bouncer")
}
// The Gradle instance is shared between settings.gradle and all the
// other build.gradle files (see
// http://forums.gradle.org/gradle/topics/define_extension_properties_from_settings_xml).
// We use this ext property to pass the per-object-directory mozconfig
// between scripts. This lets us execute set-up code before we gradle
// tries to configure the project even once, and as a side benefit
// saves invoking |mach environment| multiple times.
gradle.ext.mozconfig = json
throw new GradleException("Building with Gradle is not supported.")

@ -7,19 +7,6 @@ PKG_STAGE = $(DIST)/test-stage
include $(topsrcdir)/config/rules.mk
# Fennec and all instrumentation tests need to be signed with the same
# key, which means release signing them all.
include $(topsrcdir)/config/android-common.mk
stage-package:
$(NSINSTALL) -D $(_DEST_DIR)
ifndef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
$(call RELEASE_SIGN_ANDROID_APK,\
$(DEPTH)/mobile/android/tests/background/junit3/background-junit3-debug-unsigned-unaligned.apk,\
$(_DEST_DIR)/background-junit3.apk)
$(call RELEASE_SIGN_ANDROID_APK,\
$(DEPTH)/mobile/android/tests/browser/junit3/browser-junit3-debug-unsigned-unaligned.apk,\
$(_DEST_DIR)/browser-junit3.apk)
endif
@(cd $(DEPTH)/_tests/ && tar $(TAR_CREATE_FLAGS) - instrumentation) | (cd $(PKG_STAGE) && tar -xf -)

@ -18,19 +18,3 @@ libs::
$(_DEST_DIR):
$(NSINSTALL) -D $@
# On Android only, include a release signed Robocop APK in the test package.
ifeq ($(MOZ_BUILD_APP),mobile/android)
include $(topsrcdir)/config/android-common.mk
ifndef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
robocop_apk := $(topobjdir)/mobile/android/tests/browser/robocop/robocop-debug-unsigned-unaligned.apk
else
robocop_apk := $(topobjdir)/gradle/build/mobile/android/app/outputs/apk/app-automation-debug-androidTest-unaligned.apk
endif
stage-package-android:
$(NSINSTALL) -D $(_DEST_DIR)
$(call RELEASE_SIGN_ANDROID_APK,$(robocop_apk),$(_DEST_DIR)/robocop.apk)
stage-package: stage-package-android
endif

@ -28,8 +28,6 @@ def run_mochitest(context, **kwargs):
args.test_paths = map(normalize, args.test_paths)
import mozinfo
if mozinfo.info.get('buildapp') == 'mobile/android':
return run_mochitest_android(context, args)
return run_mochitest_desktop(context, args)
@ -42,29 +40,10 @@ def run_mochitest_desktop(context, args):
return run_test_harness(parser, args)
def run_mochitest_android(context, args):
args.app = args.app or 'org.mozilla.fennec'
args.extraProfileFiles.append(os.path.join(context.package_root, 'mochitest', 'fonts'))
args.utilityPath = context.hostutils
args.xrePath = context.hostutils
config = context.mozharness_config
if config:
args.remoteWebServer = config['remote_webserver']
args.httpPort = config['emulator']['http_port']
args.sslPort = config['emulator']['ssl_port']
args.adbPath = config['exes']['adb'] % {'abs_work_dir': context.mozharness_workdir}
from runtestsremote import run_test_harness
return run_test_harness(parser, args)
def setup_argument_parser():
import mozinfo
mozinfo.find_and_update_from_json(here)
app = 'generic'
if mozinfo.info.get('buildapp') == 'mobile/android':
app = 'android'
from mochitest_options import MochitestArgumentParser
global parser

@ -1,459 +0,0 @@
import os
config = {
"buildbot_json_path": "buildprops.json",
"host_utils_url": "http://talos-remote.pvt.build.mozilla.org/tegra/tegra-host-utils.Linux.1109310.2.zip",
"robocop_package_name": "org.mozilla.roboexample.test",
"device_ip": "127.0.0.1",
"default_sut_port1": "20701",
"default_sut_port2": "20700", # does not prompt for commands
"tooltool_manifest_path": "testing/config/tooltool-manifests/androidarm/releng.manifest",
"tooltool_cache": "/builds/tooltool_cache",
"emulator_manifest": """
[
{
"size": 193383673,
"digest": "6609e8b95db59c6a3ad60fc3dcfc358b2c8ec8b4dda4c2780eb439e1c5dcc5d550f2e47ce56ba14309363070078d09b5287e372f6e95686110ff8a2ef1838221",
"algorithm": "sha512",
"filename": "android-sdk18_0.r18moz1.orig.tar.gz",
"unpack": "True"
}
] """,
"emulator_process_name": "emulator64-arm",
"emulator_extra_args": "-debug init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket -qemu -m 1024 -cpu cortex-a9",
"device_manager": "sut",
"exes": {
'adb': '%(abs_work_dir)s/android-sdk18/platform-tools/adb',
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"env": {
"DISPLAY": ":0.0",
"PATH": "%(PATH)s:%(abs_work_dir)s/android-sdk18/tools:%(abs_work_dir)s/android-sdk18/platform-tools",
"MINIDUMP_SAVEPATH": "%(abs_work_dir)s/../minidumps"
},
"default_actions": [
'clobber',
'read-buildbot-config',
'setup-avds',
'start-emulator',
'download-and-extract',
'create-virtualenv',
'verify-emulator',
'install',
'run-tests',
],
"emulator": {
"name": "test-1",
"device_id": "emulator-5554",
"http_port": "8854", # starting http port to use for the mochitest server
"ssl_port": "4454", # starting ssl port to use for the server
"emulator_port": 5554,
"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",
"--extra-profile-file=fonts",
"--extra-profile-file=hyphenation",
"--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",
],
},
"mochitest-media": {
"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=2",
"--subsuite=media",
],
},
"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",
"--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",
"--extra-profile-file=fonts",
"--extra-profile-file=hyphenation",
"--suite=reftest",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
],
"tests": ["tests/layout/reftests/reftest.list"],
},
"crashtest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--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",
"--suite=crashtest",
],
"tests": ["tests/testing/crashtest/crashtests.list"],
},
"jsreftest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--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=6",
"--extra-profile-file=jsreftest/tests/user.js",
"--suite=jstestbrowser",
],
"tests": ["../jsreftest/tests/jstests.list"],
},
"xpcshell": {
"run_filename": "remotexpcshelltests.py",
"testsdir": "xpcshell",
"options": [
"--dm_trans=sut",
"--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",
"extra_args": ["--this-chunk=1"],
},
"jsreftest-2": {
"category": "jsreftest",
"extra_args": ["--this-chunk=2"],
},
"jsreftest-3": {
"category": "jsreftest",
"extra_args": ["--this-chunk=3"],
},
"jsreftest-4": {
"category": "jsreftest",
"extra_args": ["--this-chunk=4"],
},
"jsreftest-5": {
"category": "jsreftest",
"extra_args": ["--this-chunk=5"],
},
"jsreftest-6": {
"category": "jsreftest",
"extra_args": ["--this-chunk=6"],
},
"mochitest-1": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=1"],
},
"mochitest-2": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=2"],
},
"mochitest-3": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=3"],
},
"mochitest-4": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=4"],
},
"mochitest-5": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=5"],
},
"mochitest-6": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=6"],
},
"mochitest-7": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=7"],
},
"mochitest-8": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=8"],
},
"mochitest-9": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=9"],
},
"mochitest-10": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=10"],
},
"mochitest-11": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=11"],
},
"mochitest-12": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=12"],
},
"mochitest-13": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=13"],
},
"mochitest-14": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=14"],
},
"mochitest-15": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=15"],
},
"mochitest-16": {
"category": "mochitest",
"extra_args": ["--total-chunks=16", "--this-chunk=16"],
},
"mochitest-chrome": {
"category": "mochitest",
"extra_args": ["--flavor=chrome"],
},
"mochitest-media-1": {
"category": "mochitest-media",
"extra_args": ["--this-chunk=1"],
},
"mochitest-media-2": {
"category": "mochitest-media",
"extra_args": ["--this-chunk=2"],
},
"mochitest-gl-1": {
"category": "mochitest-gl",
"extra_args": ["--this-chunk=1"],
},
"mochitest-gl-2": {
"category": "mochitest-gl",
"extra_args": ["--this-chunk=2"],
},
"mochitest-gl-3": {
"category": "mochitest-gl",
"extra_args": ["--this-chunk=3"],
},
"mochitest-gl-4": {
"category": "mochitest-gl",
"extra_args": ["--this-chunk=4"],
},
"reftest-1": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=1"],
},
"reftest-2": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=2"],
},
"reftest-3": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=3"],
},
"reftest-4": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=4"],
},
"reftest-5": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=5"],
},
"reftest-6": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=6"],
},
"reftest-7": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=7"],
},
"reftest-8": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=8"],
},
"reftest-9": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=9"],
},
"reftest-10": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=10"],
},
"reftest-11": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=11"],
},
"reftest-12": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=12"],
},
"reftest-13": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=13"],
},
"reftest-14": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=14"],
},
"reftest-15": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=15"],
},
"reftest-16": {
"category": "reftest",
"extra_args": ["--total-chunks=16", "--this-chunk=16"],
},
"crashtest-1": {
"category": "crashtest",
"extra_args": ["--this-chunk=1"],
},
"crashtest-2": {
"category": "crashtest",
"extra_args": ["--this-chunk=2"],
},
"xpcshell-1": {
"category": "xpcshell",
"extra_args": ["--total-chunks=3", "--this-chunk=1"],
},
"xpcshell-2": {
"category": "xpcshell",
"extra_args": ["--total-chunks=3", "--this-chunk=2"],
},
"xpcshell-3": {
"category": "xpcshell",
"extra_args": ["--total-chunks=3", "--this-chunk=3"],
},
"robocop-1": {
"category": "robocop",
"extra_args": ["--this-chunk=1"],
},
"robocop-2": {
"category": "robocop",
"extra_args": ["--this-chunk=2"],
},
"robocop-3": {
"category": "robocop",
"extra_args": ["--this-chunk=3"],
},
"robocop-4": {
"category": "robocop",
"extra_args": ["--this-chunk=4"],
},
}, # end of "test_definitions"
"download_minidump_stackwalk": True,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
}

@ -1,10 +0,0 @@
config = {
# Additional Android 4.3 settings required when running in taskcluster.
"avds_dir": "/home/worker/workspace/build/.android",
"tooltool_cache": "/home/worker/tooltool_cache",
"download_tooltool": True,
"tooltool_servers": ['http://relengapi/tooltool/'],
"exes": {
'adb': '%(abs_work_dir)s/android-sdk18/platform-tools/adb',
}
}

@ -1,383 +0,0 @@
import os
config = {
"buildbot_json_path": "buildprops.json",
"hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
"robocop_package_name": "org.mozilla.roboexample.test",
"marionette_address": "localhost:2828",
"marionette_test_manifest": "unit-tests.ini",
"tooltool_manifest_path": "testing/config/tooltool-manifests/androidarm_4_3/releng.manifest",
"tooltool_cache": "/builds/tooltool_cache",
"avds_dir": "/home/cltbld/.android",
"emulator_manifest": """
[
{
"size": 140097024,
"digest": "51781032335c09103e8509b1a558bf22a7119392cf1ea301c49c01bdf21ff0ceb37d260bc1c322cd9b903252429fb01830fc27e4632be30cd345c95bf4b1a39b",
"algorithm": "sha512",
"filename": "android-sdk_r24.0.2-linux.tgz",
"unpack": "True"
}
] """,
"tools_manifest": """
[
{
"size": 193383673,
"digest": "6609e8b95db59c6a3ad60fc3dcfc358b2c8ec8b4dda4c2780eb439e1c5dcc5d550f2e47ce56ba14309363070078d09b5287e372f6e95686110ff8a2ef1838221",
"algorithm": "sha512",
"filename": "android-sdk18_0.r18moz1.orig.tar.gz",
"unpack": "True"
}
] """,
"emulator_process_name": "emulator64-arm",
"emulator_extra_args": "-show-kernel -debug init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket",
"device_manager": "adb",
"exes": {
'adb': '%(abs_work_dir)s/android-sdk18/platform-tools/adb',
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
},
"env": {
"DISPLAY": ":0.0",
"PATH": "%(PATH)s:%(abs_work_dir)s/android-sdk-linux/tools:%(abs_work_dir)s/android-sdk18/platform-tools",
"MINIDUMP_SAVEPATH": "%(abs_work_dir)s/../minidumps"
},
"default_actions": [
'clobber',
'read-buildbot-config',
'setup-avds',
'start-emulator',
'download-and-extract',
'create-virtualenv',
'verify-emulator',
'install',
'run-tests',
],
"emulator": {
"name": "test-1",
"device_id": "emulator-5554",
"http_port": "8854", # starting http port to use for the mochitest server
"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",
"--extra-profile-file=fonts",
"--extra-profile-file=hyphenation",
"--screenshot-on-fail",
"--total-chunks=20",
],
},
"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=10",
"--subsuite=webgl",
],
},
"mochitest-chrome": {
"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",
"--extra-profile-file=fonts",
"--extra-profile-file=hyphenation",
"--screenshot-on-fail",
"--flavor=chrome",
],
},
"mochitest-plain-gpu": {
"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",
"--subsuite=gpu",
],
},
"mochitest-plain-clipboard": {
"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",
"--subsuite=clipboard",
],
},
"mochitest-media": {
"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",
"--chunk-by-runtime",
"--total-chunks=2",
"--subsuite=media",
],
},
"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",
"--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",
"--extra-profile-file=fonts",
"--extra-profile-file=hyphenation",
"--suite=reftest",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
],
"tests": ["tests/layout/reftests/reftest.list",],
},
"reftest-debug": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--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=48",
"--extra-profile-file=fonts",
"--extra-profile-file=hyphenation",
"tests/layout/reftests/reftest.list",
],
},
"crashtest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--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=4",
"--suite=crashtest",
],
"tests": ["tests/testing/crashtest/crashtests.list",],
},
"crashtest-debug": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--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=10",
"tests/testing/crashtest/crashtests.list",
],
},
"jsreftest": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--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=6",
"--extra-profile-file=jsreftest/tests/user.js",
"--suite=jstestbrowser",
],
"tests": ["../jsreftest/tests/jstests.list",],
},
"jsreftest-debug": {
"run_filename": "remotereftest.py",
"testsdir": "reftest",
"options": [
"--app=%(app)s",
"--ignore-window-size",
"--dm_trans=adb",
"--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=20",
"--extra-profile-file=jsreftest/tests/user.js",
],
},
"xpcshell": {
"run_filename": "remotexpcshelltests.py",
"testsdir": "xpcshell",
"install": False,
"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",
"--test-plugin-path=none",
"--total-chunks=3",
],
},
"cppunittest": {
"run_filename": "remotecppunittests.py",
"testsdir": "cppunittest",
"install": False,
"options": [
"--symbols-path=%(symbols_path)s",
"--xre-path=%(xre_path)s",
"--dm_trans=adb",
"--localBinDir=../bin",
"--apk=%(installer_path)s",
".",
],
},
"marionette": {
"run_filename": os.path.join("harness", "marionette_harness", "runtests.py"),
"testsdir": "marionette",
"options": [
"--emulator",
"--app=fennec",
"--package=%(app)s",
"--address=%(address)s",
"%(test_manifest)s",
"--disable-e10s",
"--gecko-log=%(gecko_log)s",
"--log-raw=%(raw_log_file)s",
"--log-errorsummary=%(error_summary_file)s",
"--symbols-path=%(symbols_path)s",
"--startup-timeout=300",
],
},
}, # end suite_definitions
"download_minidump_stackwalk": True,
"default_blob_upload_servers": [
"https://blobupload.elasticbeanstalk.com",
],
"blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
}

@ -1,9 +0,0 @@
# This config contains dev values that will replace
# the values specified in the production config
# if specified like this (order matters):
# --cfg android/androidarm.py
# --cfg android/androidarm_dev.py
import os
config = {
"tooltool_cache_path": os.path.join(os.getenv("HOME"), "cache"),
}

@ -1,73 +0,0 @@
import os
config = {
"buildbot_json_path": "buildprops.json",
"hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
"tooltool_manifest_path": "testing/config/tooltool-manifests/androidx86/releng.manifest",
"tooltool_cache": "/home/worker/tooltool_cache",
"download_tooltool": True,
"tooltool_servers": ['http://relengapi/tooltool/'],
"avds_dir": "/home/worker/workspace/build/.android",
"emulator_manifest": """
[
{
"size": 193383673,
"digest": "6609e8b95db59c6a3ad60fc3dcfc358b2c8ec8b4dda4c2780eb439e1c5dcc5d550f2e47ce56ba14309363070078d09b5287e372f6e95686110ff8a2ef1838221",
"algorithm": "sha512",
"filename": "android-sdk18_0.r18moz1.orig.tar.gz",
"unpack": "True"
}
] """,
"emulator_process_name": "emulator64-x86",
"emulator_extra_args": "-show-kernel -debug init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket -qemu -m 1024",
"device_manager": "adb",
"exes": {
'adb': '%(abs_work_dir)s/android-sdk18/platform-tools/adb',
},
"env": {
"DISPLAY": ":0.0",
"PATH": "%(PATH)s:%(abs_work_dir)s/android-sdk18/tools:%(abs_work_dir)s/android-sdk18/platform-tools",
"MINIDUMP_SAVEPATH": "%(abs_work_dir)s/../minidumps"
},
"default_actions": [
'clobber',