summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/marionette/harness/marionette_harness/tests/webapi-tests.ini2
-rw-r--r--testing/mochitest/runtests.py5
-rw-r--r--testing/modules/tests/xpcshell/xpcshell.ini2
-rwxr-xr-xtesting/mozbase/mozrunner/mozrunner/utils.py5
-rw-r--r--testing/xpcshell/example/unit/xpcshell.ini2
5 files changed, 5 insertions, 11 deletions
diff --git a/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini b/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini
index 66a72ae4d..5c94220af 100644
--- a/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini
+++ b/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini
@@ -1,7 +1,5 @@
[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/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