From b7d9dad58e5a3f87a6c767412941700bc8010044 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sat, 12 May 2018 14:32:03 +0200
Subject: Remove MOZ_B2G leftovers and some dead B2G-only components.

---
 testing/marionette/assert.js                      | 2 +-
 testing/specialpowers/content/specialpowersAPI.js | 4 ----
 testing/testsuite-targets.mk                      | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'testing')

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/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
-- 
cgit v1.2.3