Remove browser_bug571289.js as a followup to bug 610381 and bug 608142. The test is meaningless because the condition is not allowed to happen. r=gal a=orange
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 17 Nov 2010 18:16:18 -0500
changeset 57841 5edec88ca944fe4aab1264f3f419adf5e01cb8db
parent 57840 94e93142bfb6912bf49c8b5e1cdf5a4c799270ca
child 57842 b433764562cc063de9d5164b1cc6239b1f15096f
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersgal, orange
bugs571289, 610381, 608142
milestone2.0b8pre
Remove browser_bug571289.js as a followup to bug 610381 and bug 608142. The test is meaningless because the condition is not allowed to happen. r=gal a=orange
caps/tests/Makefile.in
caps/tests/browser/Makefile.in
caps/tests/browser/browser_bug571289.js
--- a/caps/tests/Makefile.in
+++ b/caps/tests/Makefile.in
@@ -38,11 +38,11 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = mochitest browser
+DIRS = mochitest
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/caps/tests/browser/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# the Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Justin Lebar <justin.lebar@gmail.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = caps/tests/browser
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
-_BROWSER_TEST_FILES = \
-  browser_bug571289.js \
-  $(NULL)
-
-libs:: $(_BROWSER_TEST_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
deleted file mode 100644
--- a/caps/tests/browser/browser_bug571289.js
+++ /dev/null
@@ -1,24 +0,0 @@
-function test() {
-  // Access an xpcom component from off the main thread.
-
-  let threadman = Components.classes["@mozilla.org/thread-manager;1"].
-                             getService(Ci.nsIThreadManager);
-  let thread = threadman.newThread(0);
-
-  thread.dispatch(
-    function() {
-      // Get another handle on the thread manager, this time from within the
-      // thread we created.
-      let threadman2 = Components.classes["@mozilla.org/thread-manager;1"].
-                                  getService(Ci.nsIThreadManager);
-
-      // Now do something with the thread manager.  It doesn't really matter
-      // what we do.
-      if (threadman2.mainThread == threadman2.currentThread)
-        ok(false, "Shouldn't be on the main thread.");
-
-    }, 1); // dispatch sync
-
-  thread.shutdown();
-  ok(true, "Done!");
-}