From 469b2190fed45be25d91199a4d9f521551755124 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 10 Apr 2011 13:23:45 -0700 Subject: [PATCH] Bug 648898 - Remove the xptinfo tests we don't want to bother running, r=bsmedberg --- testing/xpcshell/Makefile.in | 4 -- xpcom/tests/Makefile.in | 5 -- xpcom/tests/xptinfo/Makefile.in | 59 ------------------- xpcom/tests/xptinfo/xptiITestInterface.idl | 47 --------------- .../xptinfo/xptunit/test_jar_xptloading.js | 10 ---- 5 files changed, 125 deletions(-) delete mode 100644 xpcom/tests/xptinfo/Makefile.in delete mode 100644 xpcom/tests/xptinfo/xptiITestInterface.idl delete mode 100644 xpcom/tests/xptinfo/xptunit/test_jar_xptloading.js diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in index c5a6b93e9b0..b48e2a3db0c 100644 --- a/testing/xpcshell/Makefile.in +++ b/testing/xpcshell/Makefile.in @@ -78,10 +78,6 @@ TEST_HARNESS_COMPONENTS := \ 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 diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index d839ae8e467..f0853c4609b 100644 --- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -51,11 +51,6 @@ 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 diff --git a/xpcom/tests/xptinfo/Makefile.in b/xpcom/tests/xptinfo/Makefile.in deleted file mode 100644 index d6537a4bb26..00000000000 --- 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 -# 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 diff --git a/xpcom/tests/xptinfo/xptiITestInterface.idl b/xpcom/tests/xptinfo/xptiITestInterface.idl deleted file mode 100644 index 36f368eb379..00000000000 --- 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 . - * 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); -}; diff --git a/xpcom/tests/xptinfo/xptunit/test_jar_xptloading.js b/xpcom/tests/xptinfo/xptunit/test_jar_xptloading.js deleted file mode 100644 index 262998066c8..00000000000 --- 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"); -}