From e877a2d9e694d8bd78b6bfc602f51b85da138fdc Mon Sep 17 00:00:00 2001
From: "bob%bclary.com" <bob%bclary.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 13 Jan 2006 19:44:20 +0000
Subject: [PATCH] JS Test Library - update make file for tests, remove make
 macros

git-svn-id: svn://10.0.0.236/trunk@187582 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/tests/Maketests | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/mozilla/js/tests/Maketests b/mozilla/js/tests/Maketests
index b29481222a5..d5a6b632a6d 100755
--- a/mozilla/js/tests/Maketests
+++ b/mozilla/js/tests/Maketests
@@ -37,10 +37,6 @@
 # ***** END LICENSE BLOCK *****
 include config.mk
 
-dashes   = ----------
-msg = @echo "$(1)": $(dashes) $(2) $(dashes)
-prepend = sed 's/^/$(1): /'
-html2text = lynx --dump $(1)
 TEST_PROFILE?=TEST
 
 
@@ -62,7 +58,7 @@ all: shell browser
 
 shell: jsshell e4xshell
 
-browser: jsbrowser e4xbrowser jsbrowsereach e4xbrowsereach
+browser: jsbrowsereach e4xbrowsereach
 
 browsereach: jsbrowsereach e4xbrowsereach
 
@@ -71,55 +67,43 @@ browsereach: jsbrowsereach e4xbrowsereach
 #
 
 jsshell:
-	$(call msg,jsshell,Begin JavaScript Test Suite)
 	-perl jsDriver.pl \
 		-L e4x lc2 lc3 spidermonkey-n.tests \
 		-s $(TEST_JS_EXE) \
 		-e sm$(TEST_OPTDEBUG) \
 		-o '-S 524288' \
 		-k \
-		-f $(LOG)-results-js.html 2>&1 | $(call prepend,jsshell)
-	$(call msg,jsshell,End JavaScript Test Suite)
+		-f $(LOG)-results-js.html 2>&1 | sed 's/^/jsshell: /'
 
 e4xshell:
-	$(call msg,jse4xshell,Begin JavaScript Test Suite)
 	-perl jsDriver.pl \
 		-l e4x -L spidermonkey-n.tests \
 		-s $(TEST_JS_EXE) \
 		-o '-S 524288 -x' \
 		-e sm$(TEST_OPTDEBUG) \
 		-k \
-		-f $(LOG)-results-e4x.html 2>&1 | $(call prepend,jse4xshell)
-	$(call msg,jse4xshell,End JavaScript Test Suite)
+		-f $(LOG)-results-e4x.html 2>&1 | sed 's/^/e4xshell: /'
 
 #
 # browser based tests
 #
 
 jsbrowser: menu.html
-	$(call msg,jsbrowser,Begin JavaScript Test Suite)
-	$(TEST_BIN)/init-profile.sh -b $(TEST_EXE) -n $(TEST_PROFILE) -e $(TEST_DIR)/xpi -u $(TEST_DIR)/prefs/test-user.js  -t js | $(call prepend,jsbrowser)
 	$(TEST_BIN)/pipeline.sh \
 		"$(TEST_BIN)/spider.pl $(TEST_BIN) $(TEST_JSBROWSER_TIMEOUT) $(TEST_EXE) $(TEST_PROFILE) /tests/mozilla.org/js/userhook-js.js menu-list.txt 0 js 2>&1" \
 	"sed 's/^/jsbrowser: /'"
-	$(call msg,jsbrowser,End JavaScript Test Suite)
 
 e4xbrowser: menu.html
-	$(call msg,jse4xbrowser,Begin JavaScript E4X Test Suite)
-	$(TEST_BIN)/init-profile.sh -b $(TEST_EXE) -n $(TEST_PROFILE) -e $(TEST_DIR)/xpi -u $(TEST_DIR)/prefs/test-user.js  -t e4x | $(call prepend,jse4xbrowser)
 	$(TEST_BIN)/pipeline.sh \
 		"$(TEST_BIN)/spider.pl $(TEST_BIN) $(TEST_JSBROWSER_TIMEOUT) $(TEST_EXE) $(TEST_PROFILE) /tests/mozilla.org/js/userhook-e4x.js menu-list.txt 0 e4x 2>&1" \
 		"sed 's/^/e4xbrowser: /'"
-	$(call msg,jse4xbrowser,End JavaScript E4X Test Suite)
 
 jsbrowsereach: menu.html
-	$(TEST_BIN)/init-profile.sh -b $(TEST_EXE) -n $(TEST_PROFILE) -e $(TEST_DIR)/xpi -u $(TEST_DIR)/prefs/test-user.js  -t js | $(call prepend,jsbrowsereach)
 	$(TEST_BIN)/pipeline.sh \
 		"$(TEST_BIN)/spider.pl $(TEST_BIN) $(TEST_JSEACH_TIMEOUT) $(TEST_EXE) $(TEST_PROFILE) /tests/mozilla.org/js/userhookeach-js.js js-list.txt 0 js 2>&1" \
 	"sed 's/^/jsbrowsereach: /'"
 
 e4xbrowsereach: menu.html
-	$(TEST_BIN)/init-profile.sh -b $(TEST_EXE) -n $(TEST_PROFILE) -e $(TEST_DIR)/xpi -u $(TEST_DIR)/prefs/test-user.js -t e4x | $(call prepend,e4xbrowsereach)
 	$(TEST_BIN)/pipeline.sh \
 		"$(TEST_BIN)/spider.pl $(TEST_BIN) $(TEST_JSEACH_TIMEOUT) $(TEST_EXE) $(TEST_PROFILE) /tests/mozilla.org/js/userhookeach-e4x.js e4x-list.txt 0 e4x 2>&1" \
 	"sed 's/^/e4xbrowsereach: /'"