Bug 818259 - Fix undefined reference in remote/b2g xpcshell, r=mdas, DONTBUILD a=NPOTB,test-only
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 05 Dec 2012 10:53:03 -0500
changeset 115039 2812c6500aed86af4edc7479476f53fce7e3970f
parent 115038 56f34c1cc509839a0f639c064693d6666c39e151
child 115040 545107c3b807cce9b1a95e7d03776b314e858af5
push id23952
push userahalberstadt@mozilla.com
push dateWed, 05 Dec 2012 15:53:53 +0000
treeherdermozilla-central@2812c6500aed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmdas, DONTBUILD, NPOTB, test-only
bugs818259
milestone20.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 818259 - Fix undefined reference in remote/b2g xpcshell, r=mdas, DONTBUILD a=NPOTB,test-only
testing/xpcshell/remotexpcshelltests.py
testing/xpcshell/runtestsb2g.py
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -3,18 +3,18 @@
 # 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/.
 
 import sys, os
 import subprocess
 import runxpcshelltests as xpcshell
 import tempfile
-from automationutils import *
-from mozdevice import devicemanagerADB, devicemanagerSUT
+from automationutils import replaceBackSlashes
+from mozdevice import devicemanagerADB, devicemanagerSUT, DMError
 
 here = os.path.dirname(os.path.abspath(__file__))
 
 # A specialization of XPCShellTests that runs tests on an Android device
 # via devicemanager.
 class XPCShellRemote(xpcshell.XPCShellTests, object):
 
     def __init__(self, devmgr, options, args):
--- a/testing/xpcshell/runtestsb2g.py
+++ b/testing/xpcshell/runtestsb2g.py
@@ -5,18 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import sys
 import os
 sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0]))))
 
 import traceback
 from remotexpcshelltests import XPCShellRemote, RemoteXPCShellOptions
-from automationutils import *
-from mozdevice import devicemanagerADB
+from mozdevice import devicemanagerADB, DMError
 
 DEVICE_TEST_ROOT = '/data/local/tests'
 
 
 from marionette import Marionette
 
 class B2GXPCShellRemote(XPCShellRemote):