diff -r 7e8f66d8a098 config/rules.mk
--- a/config/rules.mk	Sun Sep 07 02:13:16 2008 -0700
+++ b/config/rules.mk	Mon Sep 08 20:39:29 2008 -0700
@@ -1933,13 +1933,19 @@
 endif
 endif # CYGWIN_WRAPPER
 
+ifdef USECHRONICLE
+XPCSHELL=chronicle-xpcshell
+else
+XPCSHELL=xpcshell
+endif
+
 # Test execution
 check::
 	@$(EXIT_ON_ERROR) \
 	for testdir in $(XPCSHELL_TESTS); do \
 	  $(RUN_TEST_PROGRAM) \
 	    $(MOZILLA_SRCDIR)/tools/test-harness/xpcshell-simple/test_all.sh \
-	      $(DIST)/bin/xpcshell \
+	      $(DIST)/bin/$(XPCSHELL) \
 	      $(FWDSLASH_TOPSRCDIR) \
 	      $(NATIVE_TOPSRCDIR) \
 	      $(MOZDEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir; \
@@ -1950,7 +1956,7 @@
 	@$(EXIT_ON_ERROR) \
 	$(RUN_TEST_PROGRAM) \
 	  $(MOZILLA_SRCDIR)/tools/test-harness/xpcshell-simple/test_one.sh \
-	    $(DIST)/bin/xpcshell \
+	    $(DIST)/bin/$(XPCSHELL) \
 	    $(FWDSLASH_TOPSRCDIR) \
 	    $(NATIVE_TOPSRCDIR) \
 	    $(MOZDEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \
@@ -1961,7 +1967,7 @@
 	@$(EXIT_ON_ERROR) \
 	$(RUN_TEST_PROGRAM) \
 	  $(MOZILLA_SRCDIR)/tools/test-harness/xpcshell-simple/test_one.sh \
-	    $(DIST)/bin/xpcshell \
+	    $(DIST)/bin/$(XPCSHELL) \
 	    $(FWDSLASH_TOPSRCDIR) \
 	    $(NATIVE_TOPSRCDIR) \
 	    $(MOZDEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \