Bug 648898 - Remove the xptinfo tests we don't want to bother running, r=bsmedberg
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 10 Apr 2011 13:23:45 -0700
changeset 68189 d2259dd3da34e3860e974d37e972dd286c3051cf
parent 68188 ab7b7d345f4a7cc99cff73a45f93540df833bdb8
child 68190 b140e7746652f2783306c054ee2802db52272fd8
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs648898
milestone6.0a1
Bug 648898 - Remove the xptinfo tests we don't want to bother running, r=bsmedberg
testing/xpcshell/Makefile.in
xpcom/tests/Makefile.in
xpcom/tests/xptinfo/Makefile.in
xpcom/tests/xptinfo/xptiITestInterface.idl
xpcom/tests/xptinfo/xptunit/test_jar_xptloading.js
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -73,20 +73,16 @@ MOBILE_BUILD_FILES := \
 
 # Components / typelibs that don't get packaged with
 # the build, but that we need for the test harness.
 TEST_HARNESS_COMPONENTS := \
   httpd.js \
   httpd.manifest \
   $(NULL)
 
-ifdef MOZ_ENABLE_LIBXUL
-TEST_HARNESS_COMPONENTS += xpcom_typelib_test.jar
-endif
-
 # Rules for staging the necessary harness bits for a test package
 PKG_STAGE = $(DIST)/test-package-stage
 
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/xpcshell/tests
 	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
 	@(cd $(topsrcdir)/build && tar $(TAR_CREATE_FLAGS) - $(EXTRA_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
 	@(cd $(topsrcdir)/build/mobile && tar $(TAR_CREATE_FLAGS) - $(MOBILE_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -46,21 +46,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpcom
 
 ifndef MOZ_ENABLE_LIBXUL
 MOZILLA_INTERNAL_API = 1
 endif
 
 DIRS		= external component
 
-# Disabled because manifests make this test difficult to run correctly.
-# ifdef MOZ_ENABLE_LIBXUL
-# DIRS += xptinfo
-# endif
-
 ifeq ($(OS_ARCH),WINNT)
 DIRS		+= windows
 endif
 
 ifdef DEHYDRA_PATH
 DIRS += static-checker
 endif
 
deleted file mode 100644
--- a/xpcom/tests/xptinfo/Makefile.in
+++ /dev/null
@@ -1,59 +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 Firefox.
-#
-# The Initial Developer of the Original Code is
-# the Mozilla Foundation <http://www.mozilla.org>
-# Portions created by the Initial Developer are Copyright (C) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either 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@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = xpcom
-XPIDL_MODULE = xpcom_typelib_testxpt
-NO_DIST_INSTALL = 1
-
-XPIDLSRCS = xptiITestInterface.idl
-
-XPCSHELL_TESTS = xptunit
-
-include $(topsrcdir)/config/rules.mk
-
-xpcom_typelib_test.jar:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
-	$(RM) -f $@
-	cd $(XPIDL_GEN_DIR) && $(ZIP) -q ../$(@F) $(^F)
-
-libs:: xpcom_typelib_test.jar
-	$(INSTALL) $^ $(FINAL_TARGET)/components
deleted file mode 100644
--- a/xpcom/tests/xptinfo/xptiITestInterface.idl
+++ /dev/null
@@ -1,47 +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 Firefox.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation <http://www.mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either 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 ***** */
-
-#include "nsISupports.idl"
-
-/**
- * This interface is not implemented: it exists only for a test of whether
- * we load XPTs from JAR files correctly.
- */
-[scriptable, uuid(13c9fc33-40e6-44dc-81e2-21e0dd41f232)]
-interface xptiITestInterface : nsISupports
-{
-  void testMethod(in unsigned long testArg);
-};
deleted file mode 100644
--- a/xpcom/tests/xptinfo/xptunit/test_jar_xptloading.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function run_test()
-{
-  const xptiITestInterface_IID = "{13c9fc33-40e6-44dc-81e2-21e0dd41f232}";
-
-  var id = Components.interfaces.xptiITestInterface;
-  do_check_true(id != undefined, "xptiITestInterface not registered");
-
-  var id2 = Components.interfacesByID[xptiITestInterface_IID];
-  do_check_true(id.toString() == id2, "xptiITestInterface info doesn't match");
-}