From 5cde1b6a80d055a88bad33de87d17f223baea873 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Fri, 18 Sep 2015 13:51:57 -0600 Subject: [PATCH] Bug 1206142 - Use adb as default devicemanager for Android xpcshell tests; r=jgraham --- testing/mozharness/configs/android/androidarm.py | 1 + testing/mozharness/configs/android/androidx86.py | 3 ++- testing/xpcshell/xpcshellcommandline.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/testing/mozharness/configs/android/androidarm.py b/testing/mozharness/configs/android/androidarm.py index 3e3ff8fa5ec..ce7ac695c84 100644 --- a/testing/mozharness/configs/android/androidarm.py +++ b/testing/mozharness/configs/android/androidarm.py @@ -193,6 +193,7 @@ config = { "run_filename": "remotexpcshelltests.py", "testsdir": "xpcshell", "options": [ + "--dm_trans=sut", "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", "--xre-path=%(xre_path)s", diff --git a/testing/mozharness/configs/android/androidx86.py b/testing/mozharness/configs/android/androidx86.py index e69fd484d9f..a6f432a541b 100644 --- a/testing/mozharness/configs/android/androidx86.py +++ b/testing/mozharness/configs/android/androidx86.py @@ -119,7 +119,8 @@ config = { }, "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", diff --git a/testing/xpcshell/xpcshellcommandline.py b/testing/xpcshell/xpcshellcommandline.py index 7152ec9ac52..d9e45106671 100644 --- a/testing/xpcshell/xpcshellcommandline.py +++ b/testing/xpcshell/xpcshellcommandline.py @@ -113,8 +113,8 @@ def add_remote_arguments(parser): 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")