diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 14:32:03 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 14:32:03 +0200 |
| commit | b7d9dad58e5a3f87a6c767412941700bc8010044 (patch) | |
| tree | f5e99b3029cf54409ae5951e9e91cca3a54addc7 /testing | |
| parent | 73cdd6117df7c17b76aad93952cf574c494351aa (diff) | |
| download | uxp-b7d9dad58e5a3f87a6c767412941700bc8010044.tar.gz | |
Remove MOZ_B2G leftovers and some dead B2G-only components.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/marionette/assert.js | 2 | ||||
| -rw-r--r-- | testing/specialpowers/content/specialpowersAPI.js | 4 | ||||
| -rw-r--r-- | testing/testsuite-targets.mk | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/testing/marionette/assert.js b/testing/marionette/assert.js index d1a55bd7cc..b2d228d0ef 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/specialpowers/content/specialpowersAPI.js b/testing/specialpowers/content/specialpowersAPI.js index 8f1ff7465c..e97ad89c40 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 8b1d7d50d7..ebe0d06cf0 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 |