From a97cdd879e694f345750f5a3c26706546a25e0d6 Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahalberstadt@mozilla.com>
Date: Wed, 19 Mar 2014 11:23:29 -0400
Subject: [PATCH] Bug 983262 - Remove obsolete b2g mochitest json manifests,
 r=jmaher

---
 testing/mochitest/Makefile.in      | 3 ---
 testing/mochitest/b2g-debug.json   | 6 ------
 testing/mochitest/b2g-desktop.json | 6 ------
 testing/mochitest/b2g.json         | 6 ------
 testing/mochitest/mach_commands.py | 7 -------
 5 files changed, 28 deletions(-)
 delete mode 100644 testing/mochitest/b2g-debug.json
 delete mode 100644 testing/mochitest/b2g-desktop.json
 delete mode 100644 testing/mochitest/b2g.json

diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index defbf57079d1..7811cacf6e1b 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -44,9 +44,6 @@ SERV_FILES = 	\
 		android.json \
 		androidx86.json \
 		android23.json \
-		b2g.json \
-		b2g-desktop.json \
-		b2g-debug.json \
 		gl.json \
 		b2g_start_script.js \
 		$(NULL)	
diff --git a/testing/mochitest/b2g-debug.json b/testing/mochitest/b2g-debug.json
deleted file mode 100644
index dbacd4b7ca68..000000000000
--- a/testing/mochitest/b2g-debug.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-"runtests": {
-  },
-"excludetests": {
-  }
-}
diff --git a/testing/mochitest/b2g-desktop.json b/testing/mochitest/b2g-desktop.json
deleted file mode 100644
index dbacd4b7ca68..000000000000
--- a/testing/mochitest/b2g-desktop.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-"runtests": {
-  },
-"excludetests": {
-  }
-}
diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json
deleted file mode 100644
index dbacd4b7ca68..000000000000
--- a/testing/mochitest/b2g.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-"runtests": {
-  },
-"excludetests": {
-  }
-}
diff --git a/testing/mochitest/mach_commands.py b/testing/mochitest/mach_commands.py
index 267e08319782..f47855c75406 100644
--- a/testing/mochitest/mach_commands.py
+++ b/testing/mochitest/mach_commands.py
@@ -143,13 +143,6 @@ class MochitestRunner(MozbuildObject):
                 test_path_dir = True;
             options.testPath = test_path
 
-        # filter test directiories or all tests according to the manifest
-        if not test_path or test_path_dir:
-            if conditions.is_b2g_desktop(self):
-                options.testManifest = 'b2g-desktop.json'
-            else:
-                options.testManifest = 'b2g.json'
-
         for k, v in kwargs.iteritems():
             setattr(options, k, v)
         options.noWindow = no_window