From f3e47954185c8f4b541e93b8b7c5d65912fc392a Mon Sep 17 00:00:00 2001
From: "bclary%bclary.com" <bclary%bclary.com>
Date: Mon, 30 Apr 2007 20:03:56 +0000
Subject: [PATCH] JavaScript Tests - update automation scripts, no bug, not
 part of the build

---
 js/tests/Makefile | 34 +++++++++++++++++++++++++---------
 js/tests/list.sh  |  3 +--
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/js/tests/Makefile b/js/tests/Makefile
index f67fb836030..456cc64cf82 100644
--- a/js/tests/Makefile
+++ b/js/tests/Makefile
@@ -5,24 +5,40 @@ TEST_JS = $(shell find . -name '*.js' -print)
 CURRDIR=$(shell pwd)
 JSDIR=$(shell basename $(CURRDIR))
 
-all: menu.html js-list.txt e4x-list.txt lc-list.txt menu-list.txt
+all: menu.html 1.8.0-list.txt 1.8.1-list.txt menu-list.txt excluded-n.tests spidermonkey-extensions-n.tests
 
-menu.html: menuhead.html menufoot.html Makefile spidermonkey-n.tests $(TEST_JS)
+menu.html: menuhead.html menufoot.html Makefile excluded-n.tests $(TEST_JS)
 	perl mklistpage.pl > menubody.html
 	cat menuhead.html menubody.html menufoot.html > menu.html
 
+excluded-n.tests: spidermonkey-n.tests slow-n.tests
+	cat $^ > $@
+
+spidermonkey-extensions-n.tests: $(TEST_JS)
+	find . -name '*.js' | grep -v shell.js | grep -v browser.js | grep '/extensions/' | sort > $@
+
 menu-list.txt:
 	echo "http://$(TEST_HTTP)/tests/mozilla.org/$(JSDIR)/menu.html" > menu-list.txt
 
-js-list.txt: $(TEST_JS)
-	./list.sh ecma ecma_2 ecma_3 js1_1 js1_2 js1_3 js1_4 js1_5 js1_6 js1_7 | sort > js-list.txt
+1.8.0-list.txt: $(TEST_JS) excluded-n.tests
+	./list.sh e4x ecma ecma_2 ecma_3 js1_1 js1_2 js1_3 js1_4 js1_5 js1_6 | sort > 1.8.0-list.txt
 
-e4x-list.txt: $(TEST_JS)
-	./list.sh e4x | sort > e4x-list.txt
+1.8.1-list.txt: $(TEST_JS) 1.8.0-list.txt  excluded-n.tests
+	cat 1.8.0-list.txt > 1.8.1-list.txt
+	./list.sh js1_7 | sort >> 1.8.1-list.txt
 
-lc-list.txt: $(TEST_JS)
-	./list.sh lc2 lc3 | sort > lc-list.txt
+#e4x-list.txt: $(TEST_JS)
+#	./list.sh e4x | sort > e4x-list.txt
+
+#lc2-list.txt: $(TEST_JS)
+#	./list.sh lc2 | sort > lc2-list.txt
+
+ecma_3/RegExp/re_tests:
+	curl -LsS -m 1800 "http://www.cpan.org/src/stable.tar.bz2" -o stable.tar.bz2
+	tar -jxvf stable.tar.bz2
+	cp `find . -maxdepth 1 -name 'perl-*'`/t/op/re_tests ecma_3/RegExp/re_tests
+	rm -fR `find . -maxdepth 1 -name 'perl-*'` stable.tar.bz2
 
 clean:
-	rm -f menubody.html menu.html js-list.txt e4x-list.txt lc-list.txt menu-list.txt
+	rm -f menubody.html menu.html *-list.txt excluded-n.tests
 
diff --git a/js/tests/list.sh b/js/tests/list.sh
index 8c528fbfaec..986fc7a7474 100755
--- a/js/tests/list.sh
+++ b/js/tests/list.sh
@@ -21,7 +21,7 @@ find $dirs \
     sed 's/^\.\///' | \
     while read jsfile
   do
-  result=`grep $jsfile spidermonkey-n.tests`
+  result=`grep $jsfile excluded-n.tests`
   if [[ -z $result ]]; then
       result=`echo $jsfile | sed 's/.*js\([0-9]\)_\([0-9]\).*/\1.\2/'`
       case $result in
@@ -32,7 +32,6 @@ find $dirs \
 	  1.5) version=";version=1.5";;
 	  1.6) version=";version=1.6";;
 	  1.7) version=";version=1.7";;
-	  *) version="";;
       esac
       
       echo "http://${TEST_HTTP}/tests/mozilla.org/$jsdir/js-test-driver-standards.html?test=$jsfile;language=type;text/javascript$version"