Bug 446300 - move tools/test-harness/xpcshell-simple to testing/xpcshell
(Fv1a-CC) Rename the object tests directory
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -119,23 +119,25 @@ endif
ifdef ENABLE_TESTS
ifdef XPCSHELL_TESTS
ifndef MODULE
$(error Must define MODULE when defining XPCSHELL_TESTS.)
endif
+testxpcobjdir = $(MOZDEPTH)/_tests/xpcshell
+
# Test file installation
libs::
@$(EXIT_ON_ERROR) \
for testdir in $(XPCSHELL_TESTS); do \
$(INSTALL) \
$(srcdir)/$$testdir/*.js \
- $(MOZDEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir; \
+ $(testxpcobjdir)/$(MODULE)/$$testdir; \
done
# Path formats on Windows are hard. We require a topsrcdir formatted so that
# it may be passed to nsILocalFile.initWithPath (in other words, an absolute
# path of the form X:\path\to\topsrcdir), which we store in NATIVE_TOPSRCDIR.
# We require a forward-slashed path to topsrcdir so that it may be combined
# with a relative forward-slashed path for loading scripts, both dynamically
# and statically for head/test/tail JS files. Of course, on non-Windows none
@@ -148,50 +150,50 @@ else
FWDSLASH_TOPSRCDIR := $(MOZILLA_SRCDIR)
ifeq ($(HOST_OS_ARCH),WINNT)
NATIVE_TOPSRCDIR := $(subst /,\\,$(WIN_TOP_SRC)/mozilla)
else
NATIVE_TOPSRCDIR := $(MOZILLA_SRCDIR)
endif
endif # CYGWIN_WRAPPER
-testxpcdir = $(MOZILLA_SRCDIR)/testing/xpcshell
+testxpcsrcdir = $(MOZILLA_SRCDIR)/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) \
- $(MOZDEPTH)/_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) \
- $(MOZDEPTH)/_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) \
- $(MOZDEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \
+ $(testxpcobjdir)/$(MODULE)/$$testdir \
$(SOLO_FILE) 0;
endif # XPCSHELL_TESTS
ifdef CPP_UNIT_TESTS
# Compile the tests to $(DIST)/bin. Make lots of niceties available by default
# through TestHarness.h, by modifying the list of includes and the libs against
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -389,19 +389,19 @@ endif
libs:: $(srcdir)/profile/prefs.js
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
install:: $(srcdir)/profile/prefs.js
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
# Disable these tests due to bug 431125
TEST_COOKIES_FILES = \
- $(DIST)/../_tests/xpcshell-simple/test_cookies/unit/test_cookies.js \
- $(DIST)/../_tests/xpcshell-simple/test_cookies/unit/test_bug468700.js \
- $(DIST)/../_tests/xpcshell-simple/test_necko/unit/test_cookie_header.js \
+ $(DIST)/../_tests/xpcshell/test_cookies/unit/test_bug468700.js \
+ $(DIST)/../_tests/xpcshell/test_cookies/unit/test_cookies.js \
+ $(DIST)/../_tests/xpcshell/test_necko/unit/test_cookie_header.js \
$(NULL)
libs::
for file in $(TEST_COOKIES_FILES); do \
if test -f $$file; then $(RM) $$file; echo "function run_test() {dump('disabled for bug 431125');}" >$$file; fi; \
done
$(RM) $(DIST)/bin/TestCookie
if test -f $(DIST)/bin/TestTArray; then cp $(DIST)/bin/TestTArray $(DIST)/bin/TestCookie; fi;