Bug 1206142 - Use adb as default devicemanager for Android xpcshell tests; r=jgraham
authorGeoff Brown <gbrown@mozilla.com>
Fri, 18 Sep 2015 13:51:57 -0600
changeset 295927 65cbc7d2133957da04265f50d9db79c7dac07994
parent 295926 cce8e013f935d3aa2227300bb7ea155fb0bb733a
child 295928 1d45333a4690ec40fcb16c961c73699dc9772d18
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgraham
bugs1206142
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1206142 - Use adb as default devicemanager for Android xpcshell tests; r=jgraham
testing/mozharness/configs/android/androidarm.py
testing/mozharness/configs/android/androidx86.py
testing/xpcshell/xpcshellcommandline.py
--- a/testing/mozharness/configs/android/androidarm.py
+++ b/testing/mozharness/configs/android/androidarm.py
@@ -188,16 +188,17 @@ config = {
                 "--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",
--- a/testing/mozharness/configs/android/androidx86.py
+++ b/testing/mozharness/configs/android/androidx86.py
@@ -114,17 +114,18 @@ config = {
                         "--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",
+            "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",
--- a/testing/xpcshell/xpcshellcommandline.py
+++ b/testing/xpcshell/xpcshellcommandline.py
@@ -108,18 +108,18 @@ def add_common_arguments(parser):
 def add_remote_arguments(parser):
     parser.add_argument("--deviceIP", action="store", type=str, dest="deviceIP",
                         help="ip address of remote device to test")
 
     parser.add_argument("--devicePort", action="store", type=str, dest="devicePort",
                         default=20701, help="port of remote device to test")
 
     parser.add_argument("--dm_trans", action="store", type=str, dest="dm_trans",
-                        choices=["adb", "sut"], default="sut",
-                        help="the transport to use to communicate with device: [adb|sut]; default=sut")
+                        choices=["adb", "sut"], default="adb",
+                        help="the transport to use to communicate with device: [adb|sut]; default=adb")
 
     parser.add_argument("--objdir", action="store", type=str, dest="objdir",
                         help="local objdir, containing xpcshell binaries")
 
 
     parser.add_argument("--apk", action="store", type=str, dest="localAPK",
                         help="local path to Fennec APK")