diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/marionette/assert.js | 2 | ||||
| -rw-r--r-- | testing/marionette/harness/marionette_harness/tests/webapi-tests.ini | 3 | ||||
| -rw-r--r-- | testing/mochitest/runtests.py | 5 | ||||
| -rw-r--r-- | testing/modules/tests/xpcshell/xpcshell.ini | 2 | ||||
| -rwxr-xr-x | testing/mozbase/mozrunner/mozrunner/utils.py | 5 | ||||
| -rw-r--r-- | testing/specialpowers/content/specialpowersAPI.js | 4 | ||||
| -rw-r--r-- | testing/testsuite-targets.mk | 4 | ||||
| -rw-r--r-- | testing/xpcshell/example/unit/xpcshell.ini | 2 |
8 files changed, 6 insertions, 21 deletions
diff --git a/testing/marionette/assert.js b/testing/marionette/assert.js index d1a55bd7c..b2d228d0e 100644 --- a/testing/marionette/assert.js +++ b/testing/marionette/assert.js @@ -15,7 +15,7 @@ Cu.import("chrome://marionette/content/error.js"); this.EXPORTED_SYMBOLS = ["assert"]; const isFennec = () => AppConstants.platform == "android"; -const isB2G = () => AppConstants.MOZ_B2G; +const isB2G = () => false; const isFirefox = () => Services.appinfo.name == "Firefox"; /** Shorthands for common assertions made in Marionette. */ diff --git a/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini b/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini index 2c9dd1dce..5c94220af 100644 --- a/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini +++ b/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini @@ -1,8 +1,5 @@ -[include:../../../../../dom/system/gonk/tests/marionette/manifest.ini] [include:../../../../../dom/system/tests/marionette/manifest.ini] skip-if = android_version > '15' # Bug 1203072 [include:../../../../../dom/events/test/marionette/manifest.ini] -[include:../../../../../dom/wifi/test/marionette/manifest.ini] -[include:../../../../../dom/tethering/tests/marionette/manifest.ini] skip-if = android_version > '15' # Bug 1203075 [include:../../../../../dom/network/tests/marionette/manifest.ini] diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py index 7d0c89a99..dd5439bd1 100644 --- a/testing/mochitest/runtests.py +++ b/testing/mochitest/runtests.py @@ -2024,9 +2024,8 @@ toolbar#nav-bar { # install specialpowers and mochikit as temporary addons addons = Addons(self.marionette) - if mozinfo.info.get('toolkit') != 'gonk': - addons.install(os.path.join(here, 'extensions', 'specialpowers'), temp=True) - addons.install(self.mochijar, temp=True) + addons.install(os.path.join(here, 'extensions', 'specialpowers'), temp=True) + addons.install(self.mochijar, temp=True) self.execute_start_script() diff --git a/testing/modules/tests/xpcshell/xpcshell.ini b/testing/modules/tests/xpcshell/xpcshell.ini index 40dc9920e..7ff4e27e3 100644 --- a/testing/modules/tests/xpcshell/xpcshell.ini +++ b/testing/modules/tests/xpcshell/xpcshell.ini @@ -1,7 +1,7 @@ [DEFAULT] head = tail = -skip-if = toolkit == 'android' || toolkit == 'gonk' +skip-if = toolkit == 'android' [test_assert.js] [test_mockRegistrar.js] diff --git a/testing/mozbase/mozrunner/mozrunner/utils.py b/testing/mozbase/mozrunner/mozrunner/utils.py index 79f26b8f2..c26055f30 100755 --- a/testing/mozbase/mozrunner/mozrunner/utils.py +++ b/testing/mozbase/mozrunner/mozrunner/utils.py @@ -101,10 +101,7 @@ def test_environment(xrePath, env=None, crashreporter=True, debugger=False, envVar = None dmdLibrary = None preloadEnvVar = None - if 'toolkit' in mozinfo.info and mozinfo.info['toolkit'] == "gonk": - # Skip all of this, it's only valid for the host. - pass - elif mozinfo.isUnix: + if mozinfo.isUnix: envVar = "LD_LIBRARY_PATH" env['MOZILLA_FIVE_HOME'] = xrePath dmdLibrary = "libdmd.so" diff --git a/testing/specialpowers/content/specialpowersAPI.js b/testing/specialpowers/content/specialpowersAPI.js index 8f1ff7465..e97ad89c4 100644 --- a/testing/specialpowers/content/specialpowersAPI.js +++ b/testing/specialpowers/content/specialpowersAPI.js @@ -1529,11 +1529,7 @@ SpecialPowersAPI.prototype = { }, get isB2G() { -#ifdef MOZ_B2G - return true; -#else return false; -#endif }, addSystemEventListener: function(target, type, listener, useCapture) { diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index 8b1d7d50d..ebe0d06cf 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -18,10 +18,6 @@ ifneq (1_WINNT,$(MOZ_PGO)_$(OS_ARCH)) BUILD_GTEST=1 endif -ifdef MOZ_B2G -BUILD_GTEST= -endif - ifndef MOZ_PHOENIX BUILD_GTEST= endif diff --git a/testing/xpcshell/example/unit/xpcshell.ini b/testing/xpcshell/example/unit/xpcshell.ini index 3af6770af..dde767225 100644 --- a/testing/xpcshell/example/unit/xpcshell.ini +++ b/testing/xpcshell/example/unit/xpcshell.ini @@ -5,7 +5,7 @@ [DEFAULT] head = tail = -skip-if = toolkit == 'gonk' +skip-if = support-files = subdir/file.txt file.txt |