Bug 446300 - move tools/test-harness/xpcshell-simple to testing/xpcshell

(Ev2-MC) Rename the object tests directory

browser/components/places/tests/unit/head_bookmarks.js

@@ -56,11 +56,8 @@ function LOG(aMsg) {
 
 var dirSvc = Cc["@mozilla.org/file/directory_service;1"].
              getService(Ci.nsIProperties);
-var gTestRoot = dirSvc.get("CurProcD", Ci.nsILocalFile);
-gTestRoot = gTestRoot.parent.parent;
-gTestRoot.append("_tests");
-gTestRoot.append("xpcshell-simple");
-gTestRoot.append("test_browser_places");
+// Remove '/unit/*.js'.
+var gTestRoot = __LOCATION__.parent.parent;
 gTestRoot.normalize();
 
 // Need to create and register a profile folder.

config/rules.mk

@@ -129,13 +129,15 @@ ifndef MODULE
 $(error Must define MODULE when defining XPCSHELL_TESTS.)
 endif
 
+testxpcobjdir = $(DEPTH)/_tests/xpcshell
+
 # Test file installation
 libs::
 	@$(EXIT_ON_ERROR) \
 	for testdir in $(XPCSHELL_TESTS); do \
 	  $(INSTALL) \
 	    $(srcdir)/$$testdir/*.js \
-	    $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir; \
+	    $(testxpcobjdir)/$(MODULE)/$$testdir; \
 	done
 
 # Path formats on Windows are hard.  We require a topsrcdir formatted so that
@@ -158,40 +160,40 @@ NATIVE_TOPSRCDIR   := $(topsrcdir)
 endif
 endif # CYGWIN_WRAPPER
 
-testxpcdir = $(topsrcdir)/testing/xpcshell
+testxpcsrcdir = $(topsrcdir)/testing/xpcshell
 
 # Test execution
 check::
 	@$(EXIT_ON_ERROR) \
 	for testdir in $(XPCSHELL_TESTS); do \
 	  $(RUN_TEST_PROGRAM) \
-	    $(testxpcdir)/test_all.sh \
+	    $(testxpcsrcdir)/test_all.sh \
 	      $(DIST)/bin/xpcshell \
 	      $(FWDSLASH_TOPSRCDIR) \
 	      $(NATIVE_TOPSRCDIR) \
-	      $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir; \
+	      $(testxpcobjdir)/$(MODULE)/$$testdir; \
 	done
 
 # Test execution
 check-interactive::
 	@$(EXIT_ON_ERROR) \
 	$(RUN_TEST_PROGRAM) \
-	  $(testxpcdir)/test_one.sh \
+	  $(testxpcsrcdir)/test_one.sh \
 	    $(DIST)/bin/xpcshell \
 	    $(FWDSLASH_TOPSRCDIR) \
 	    $(NATIVE_TOPSRCDIR) \
-	    $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \
+	    $(testxpcobjdir)/$(MODULE)/$$testdir \
 	    $(SOLO_FILE) 1;
 
 # Test execution
 check-one::
 	@$(EXIT_ON_ERROR) \
 	$(RUN_TEST_PROGRAM) \
-	  $(testxpcdir)/test_one.sh \
+	  $(testxpcsrcdir)/test_one.sh \
 	    $(DIST)/bin/xpcshell \
 	    $(FWDSLASH_TOPSRCDIR) \
 	    $(NATIVE_TOPSRCDIR) \
-	    $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \
+	    $(testxpcobjdir)/$(MODULE)/$$testdir \
 	    $(SOLO_FILE) 0;
 
 endif # XPCSHELL_TESTS

js/src/config/rules.mk

@@ -129,13 +129,15 @@ ifndef MODULE
 $(error Must define MODULE when defining XPCSHELL_TESTS.)
 endif
 
+testxpcobjdir = $(DEPTH)/_tests/xpcshell
+
 # Test file installation
 libs::
 	@$(EXIT_ON_ERROR) \
 	for testdir in $(XPCSHELL_TESTS); do \
 	  $(INSTALL) \
 	    $(srcdir)/$$testdir/*.js \
-	    $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir; \
+	    $(testxpcobjdir)/$(MODULE)/$$testdir; \
 	done
 
 # Path formats on Windows are hard.  We require a topsrcdir formatted so that
@@ -158,40 +160,40 @@ NATIVE_TOPSRCDIR   := $(topsrcdir)
 endif
 endif # CYGWIN_WRAPPER
 
-testxpcdir = $(topsrcdir)/testing/xpcshell
+testxpcsrcdir = $(topsrcdir)/testing/xpcshell
 
 # Test execution
 check::
 	@$(EXIT_ON_ERROR) \
 	for testdir in $(XPCSHELL_TESTS); do \
 	  $(RUN_TEST_PROGRAM) \
-	    $(testxpcdir)/test_all.sh \
+	    $(testxpcsrcdir)/test_all.sh \
 	      $(DIST)/bin/xpcshell \
 	      $(FWDSLASH_TOPSRCDIR) \
 	      $(NATIVE_TOPSRCDIR) \
-	      $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir; \
+	      $(testxpcobjdir)/$(MODULE)/$$testdir; \
 	done
 
 # Test execution
 check-interactive::
 	@$(EXIT_ON_ERROR) \
 	$(RUN_TEST_PROGRAM) \
-	  $(testxpcdir)/test_one.sh \
+	  $(testxpcsrcdir)/test_one.sh \
 	    $(DIST)/bin/xpcshell \
 	    $(FWDSLASH_TOPSRCDIR) \
 	    $(NATIVE_TOPSRCDIR) \
-	    $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \
+	    $(testxpcobjdir)/$(MODULE)/$$testdir \
 	    $(SOLO_FILE) 1;
 
 # Test execution
 check-one::
 	@$(EXIT_ON_ERROR) \
 	$(RUN_TEST_PROGRAM) \
-	  $(testxpcdir)/test_one.sh \
+	  $(testxpcsrcdir)/test_one.sh \
 	    $(DIST)/bin/xpcshell \
 	    $(FWDSLASH_TOPSRCDIR) \
 	    $(NATIVE_TOPSRCDIR) \
-	    $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \
+	    $(testxpcobjdir)/$(MODULE)/$$testdir \
 	    $(SOLO_FILE) 0;
 
 endif # XPCSHELL_TESTS

modules/plugin/test/unit/test_bug455213.js

@@ -54,11 +54,8 @@ var gDirSvc = Cc["@mozilla.org/file/directory_service;1"].
 // Creates a fake profile folder that the pluginhost will read our crafted
 // pluginreg.dat from
 function createProfileFolder() {
-  gProfD = gDirSvc.get("CurProcD", Ci.nsILocalFile);
-  gProfD = gProfD.parent.parent;
-  gProfD.append("_tests");
-  gProfD.append("xpcshell-simple");
-  gProfD.append("test_plugin");
+  // Remove '/unit/*.js'.
+  gProfD = __LOCATION__.parent.parent;
   gProfD.append("profile");
   
   if (gProfD.exists())

toolkit/mozapps/extensions/test/Makefile.in

@@ -40,7 +40,7 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 ADDONSRC = $(srcdir)/unit/addons
-TESTROOT = $(shell cd $(DEPTH) && pwd)/_tests/xpcshell-simple/$(MODULE)
+TESTROOT = $(shell cd $(DEPTH) && pwd)/_tests/xpcshell/$(MODULE)
 TESTPROFILE = $(TESTROOT)/profile
 TESTXPI = $(TESTROOT)/unit/addons
 relativesrcdir  = toolkit/mozapps/extensions/test

toolkit/mozapps/extensions/test/unit/head_extensionmanager.js

@@ -259,11 +259,8 @@ function restartEM()
 
 var gDirSvc = Components.classes["@mozilla.org/file/directory_service;1"]
                         .getService(Components.interfaces.nsIProperties);
-var gTestRoot = gDirSvc.get("CurProcD", Components.interfaces.nsILocalFile);
-gTestRoot = gTestRoot.parent.parent;
-gTestRoot.append("_tests");
-gTestRoot.append("xpcshell-simple");
-gTestRoot.append("test_extensionmanager");
+// Remove '/unit/*.js'.
+var gTestRoot = __LOCATION__.parent.parent;
 gTestRoot.normalize();
 
 // Need to create and register a profile folder.

toolkit/mozapps/update/test/Makefile.in

@@ -48,7 +48,7 @@ XPCSHELL_TESTS = \
   unit \
   $(NULL)
 
-TESTROOT	= $(shell cd $(DEPTH) && pwd)/_tests/xpcshell-simple/$(MODULE)
+TESTROOT	= $(shell cd $(DEPTH) && pwd)/_tests/xpcshell/$(MODULE)
 
 CPPSRCS = \
   TestAUSReadStrings.cpp \

toolkit/mozapps/update/test/unit/head_update.js

@@ -312,11 +312,8 @@ function createAppInfo(id, name, version, platformVersion)
 // Use a custom profile dir to keep the bin dir clean... not necessary but nice
 var gDirSvc = AUS_Cc["@mozilla.org/file/directory_service;1"].
              getService(AUS_Ci.nsIProperties);
-var gTestRoot = gDirSvc.get("CurProcD", AUS_Ci.nsILocalFile);
-gTestRoot = gTestRoot.parent.parent;
-gTestRoot.append("_tests");
-gTestRoot.append("xpcshell-simple");
-gTestRoot.append("test_update");
+// Remove '/unit/*.js'.
+var gTestRoot = __LOCATION__.parent.parent;
 gTestRoot.normalize();
 
 // Create and register a profile directory.