JavaScript Tests - automation updates, bug 387909, not part of the build

js/tests/Makefile

@@ -11,7 +11,7 @@ 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
+excluded-n.tests: spidermonkey-n.tests slow-n.tests performance.tests
 	cat $^ > $@
 
 spidermonkey-extensions-n.tests: $(TEST_JS)

js/tests/browser.js

@@ -147,9 +147,6 @@ window.onerror = function (msg, page, line)
 
   reportFailure(msg);
 
-  gDelayTestDriverEnd = false;
-  jsTestDriverEnd();
-
   optionsReset();
 };
 

js/tests/e4x/Global/13.1.2.1.js

@@ -512,7 +512,7 @@ function testIsXMLName(buffer)
         {
             // no current error, previous error
             // output previous error range
-            result += '[' + rangestart + '-' + rangeend + '] ' +
+            result += rangestart + '-' + rangeend + ' ' +
                 rangemessage + nl;
             rangemessage = rangestart = rangeend = null;
         }
@@ -534,7 +534,7 @@ function testIsXMLName(buffer)
             else
             {
                 // different error, output range
-                result += '[' + rangestart + '-' + rangeend + '] ' +
+                result += rangestart + '-' + rangeend + ' ' +
                     rangemessage + nl;
                 rangemessage = message;
                 rangestart = rangeend = formatChar(c);
@@ -544,7 +544,7 @@ function testIsXMLName(buffer)
 
     if (rangemessage)
     {
-        result += '[' + rangestart + '-' + rangeend + '] ' +
+        result += rangestart + '-' + rangeend + ' ' +
             rangemessage + nl;
     }
 

js/tests/e4x/Regress/regress-350206.js

@@ -39,7 +39,7 @@
 gTestfile = 'regress-350206.js';
 
 var BUGNUMBER = 350206;
-var summary = 'Assertion failure: serial <= n in jsxml.c';
+var summary = 'Do not assert: serial <= n in jsxml.c';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/e4x/Regress/regress-369032.js

@@ -38,7 +38,7 @@
 
 gTestfile = 'regress-369032.js';
 
-var summary = 'Assertion: kid2->parent == xml || !kid2->parent';
+var summary = 'Do not assert: kid2->parent == xml || !kid2->parent';
 var BUGNUMBER = 369032;
 var actual = 'No Crash';
 var expect = 'No Crash';

js/tests/e4x/Regress/regress-372563.js

@@ -39,7 +39,7 @@
 gTestfile = 'regress-372563.js';
 
 var BUGNUMBER = 372563;
-var summary = 'Assertion failure: ss->top >= 2';
+var summary = 'Do not assert: ss->top >= 2';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/e4x/Regress/regress-372564.js

@@ -39,7 +39,7 @@
 gTestfile = 'regress-372564.js';
 
 var BUGNUMBER = 372564;
-var summary = 'Assertion failure: op == JSOP_ADD';
+var summary = 'Do not assert: op == JSOP_ADD';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/e4x/Regress/regress-383255.js

@@ -38,7 +38,7 @@
 
 gTestfile = 'regress-383255.js';
 
-var summary = 'Assertion: JS_UPTRDIFF(fp->sp, fp->spbase) <= depthdiff';
+var summary = 'Do not assert: JS_UPTRDIFF(fp->sp, fp->spbase) <= depthdiff';
 var BUGNUMBER = 383255;
 var actual = '';
 var expect = '';

js/tests/ecma_3/RegExp/regress-375715-01-n.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-375715-01.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 375715;
-var summary = 'Assertion failure: (c2 <= cs->length) && (c1 <= c2)';
+var summary = 'Do not assert: (c2 <= cs->length) && (c1 <= c2)';
 var actual = '';
 var expect = '';
 

js/tests/ecma_3/RegExp/regress-375715-02.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-375715-02.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 375715;
-var summary = 'Assertion failure: (c2 <= cs->length) && (c1 <= c2)';
+var summary = 'Do not assert: (c2 <= cs->length) && (c1 <= c2)';
 var actual = '';
 var expect = '';
 

js/tests/ecma_3/RegExp/regress-375715-03.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-375715-03.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 375715;
-var summary = 'Assertion failure: (c2 <= cs->length) && (c1 <= c2)';
+var summary = 'Do not assert: (c2 <= cs->length) && (c1 <= c2)';
 var actual = '';
 var expect = '';
 

js/tests/ecma_3/RegExp/regress-375715-04.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-375715-04.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 375715;
-var summary = 'Assertion failure: (c2 <= cs->length) && (c1 <= c2)';
+var summary = 'Do not assert: (c2 <= cs->length) && (c1 <= c2)';
 var actual = '';
 var expect = '';
 

js/tests/js1_5/Regress/regress-306794.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-306794.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 306794;
-var summary = 'Assertion parsing foo getter';
+var summary = 'Do not assert: parsing foo getter';
 var actual = 'No Assertion';
 var expect = 'No Assertion';
 

js/tests/js1_5/Regress/regress-326453.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-326453.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 326453;
-var summary = 'JS_Assertion while decompiling';
+var summary = 'Do not assert: while decompiling';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_5/Regress/regress-326467.js

@@ -39,7 +39,7 @@
 var gTestfile = 'regress-326467.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 326467;
-var summary = 'Assertion failure: slot < fp->nvars, at jsinterp.c';
+var summary = 'Do not assert: slot < fp->nvars, at jsinterp.c';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_5/Regress/regress-350529.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-350529.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 350529;
-var summary = "x--' causes Assertion ";
+var summary = "Do not assert: x--'";
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_5/Regress/regress-356250.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-356250.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 356250;
-var summary = 'Assertion: !fp->fun || !(fp->fun->flags & JSFUN_HEAVYWEIGHT) || fp->callobj';
+var summary = 'Do not assert: !fp->fun || !(fp->fun->flags & JSFUN_HEAVYWEIGHT) || fp->callobj';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_5/Regress/regress-356693.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-356693.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 356693;
-var summary = 'Assertion failure: pn2->pn_op == JSOP_SETCALL';
+var summary = 'Do not assert: pn2->pn_op == JSOP_SETCALL';
 var actual = '';
 var expect = '';
 

js/tests/js1_5/extensions/regress-355339.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-355339.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 355339;
-var summary = 'Assertion: sprop->setter != js_watch_set';
+var summary = 'Do not assert: sprop->setter != js_watch_set';
 var actual = '';
 var expect = '';
 

js/tests/js1_5/extensions/regress-356402.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-356402.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 356402;
-var summary = 'Assertion failure: slot < fp->nvars';
+var summary = 'Do not assert: slot < fp->nvars';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_5/extensions/regress-361360.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-361360.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 361360;
-var summary = 'Assertion: !caller || caller->pc involving setter and watch';
+var summary = 'Do not assert: !caller || caller->pc involving setter and watch';
 var actual = '';
 var expect = '';
 

js/tests/js1_5/extensions/regress-361558.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-361558.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 361558;
-var summary = 'Assertion: sprop->setter != js_watch_set';
+var summary = 'Do not assert: sprop->setter != js_watch_set';
 var actual = '';
 var expect = '';
 

js/tests/js1_5/extensions/regress-361571.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-361571.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 361571;
-var summary = 'Assertion: fp->scopeChain == parent';
+var summary = 'Do not assert: fp->scopeChain == parent';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_5/extensions/regress-361856.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-361856.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 361856;
-var summary = 'Assertion: overwriting @ js_AddScopeProperty';
+var summary = 'Do not assert: overwriting @ js_AddScopeProperty';
 var actual = '';
 var expect = '';
 

js/tests/js1_5/extensions/regress-369404.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-369404.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 369404;
-var summary = 'Assertion failure: !SPROP_HAS_STUB_SETTER(sprop) || (sprop->attrs & JSPROP_GETTER) ';
+var summary = 'Do not assert: !SPROP_HAS_STUB_SETTER(sprop) || (sprop->attrs & JSPROP_GETTER) ';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_6/Regress/regress-372565.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-372565.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 372565;
-var summary = 'Assertion failure: top < ss->printer->script->depth" decompiling a function where a const identifier is used as a for-loop variable';
+var summary = 'Do not assert: top < ss->printer->script->depth" decompiling a function where a const identifier is used as a for-loop variable';
 var actual = '';
 var expect = '';
 

js/tests/js1_6/shell.js

@@ -41,3 +41,9 @@
 
 gTestsuite = 'js1_6';
 
+// explicitly turn on js16
+if (typeof version != 'undefined')
+{
+  version(160);
+}
+

js/tests/js1_7/block/regress-349653.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-349653.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 349653;
-var summary = 'Assertion failure: OBJ_GET_CLASS(cx, obj) == &js_ArrayClass';
+var summary = 'Do not assert: OBJ_GET_CLASS(cx, obj) == &js_ArrayClass';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_7/block/regress-350279.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-350279.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 350279;
-var summary = 'Assertion failure: left->pn_type == TOK_RC';
+var summary = 'Do not assert: left->pn_type == TOK_RC';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_7/block/regress-350730.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-350730.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 350730;
-var summary = 'Assertion: pn2->pn_slot >= 0 || varOrConst [@ EmitVariables]';
+var summary = 'Do not assert: pn2->pn_slot >= 0 || varOrConst [@ EmitVariables]';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_7/block/regress-351794.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-351794.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 351794;
-var summary = 'Assertion: CG_NOTE_COUNT(cg) == 0 || ' +
+var summary = 'Do not assert: CG_NOTE_COUNT(cg) == 0 || ' +
   'CG_LAST_NOTE_OFFSET(cg) != CG_OFFSET(cg)';
 var actual = 'No Crash';
 var expect = 'No Crash';

js/tests/js1_7/extensions/regress-352797-01.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-352797-01.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 352797;
-var summary = 'Assertion: OBJ_GET_CLASS(cx, obj) == &js_BlockClass';
+var summary = 'Do not assert: OBJ_GET_CLASS(cx, obj) == &js_BlockClass';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_7/extensions/regress-368224.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-368224.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 368224;
-var summary = 'Assertion: pnprop->pn_type == TOK_COLON';
+var summary = 'Do not assert: pnprop->pn_type == TOK_COLON';
 var actual = '';
 var expect = '';
 

js/tests/js1_7/geniter/regress-350809.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-350809.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 350809;
-var summary = 'Assertion if yield in xml filtering predicate';
+var summary = 'Do not assertion: if yield in xml filtering predicate';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_7/regress/regress-352797-02.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-352797-02.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 352797;
-var summary = 'Assertion: OBJ_GET_CLASS(cx, obj) == &js_BlockClass';
+var summary = 'Do not assert: OBJ_GET_CLASS(cx, obj) == &js_BlockClass';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/js1_7/regress/regress-361566.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-361566.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 361566;
-var summary = 'Assertion: !fp->blockChain || OBJ_GET_PARENT(cx, obj) == fp->blockChain';
+var summary = 'Do not assert: !fp->blockChain || OBJ_GET_PARENT(cx, obj) == fp->blockChain';
 var actual = '';
 var expect = '';
 

js/tests/js1_7/regress/regress-373827-01.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-373827-01.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 373827;
-var summary = 'Assertion: OBJ_GET_CLASS(cx, obj)->flags & JSCLASS_HAS_PRIVATE';
+var summary = 'Do not assert: OBJ_GET_CLASS(cx, obj)->flags & JSCLASS_HAS_PRIVATE';
 var actual = '';
 var expect = '';
 

js/tests/js1_7/regress/regress-373827-02.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-373827-02.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 373827;
-var summary = 'Assertion: OBJ_GET_CLASS(cx, obj)->flags & JSCLASS_HAS_PRIVATE';
+var summary = 'Do not assert: OBJ_GET_CLASS(cx, obj)->flags & JSCLASS_HAS_PRIVATE';
 var actual = '';
 var expect = '';
 

js/tests/js1_7/regress/regress-375695.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-375695.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 375695;
-var summary = 'Assertion: !fp->blockChain || OBJ_GET_PARENT(cx, obj) == fp->blockChain';
+var summary = 'Do not assert: !fp->blockChain || OBJ_GET_PARENT(cx, obj) == fp->blockChain';
 var actual = '';
 var expect = '';
 

js/tests/js1_7/regress/regress-379483.js

@@ -38,7 +38,7 @@
 var gTestfile = 'regress-379483.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 379483;
-var summary = 'Assertion: top < ss->printer->script->depth';
+var summary = 'Do not assert: top < ss->printer->script->depth';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/tests/list.sh

@@ -32,6 +32,9 @@ find $dirs \
 	  1.5) version=";version=1.5";;
 	  1.6) version=";version=1.6";;
 	  1.7) version=";version=1.7";;
+	  1.8) version=";version=1.8";;
+	  1.9) version=";version=1.9";;
+	  2.0) version=";version=2.0";;
       esac
       
       echo "http://${TEST_HTTP}/tests/mozilla.org/$jsdir/js-test-driver-standards.html?test=$jsfile;language=type;text/javascript$version"

js/tests/performance.tests

@@ -0,0 +1,15 @@
+ecma_3/RegExp/regress-311414.js
+ecma_3/RegExp/regress-289669.js
+js1_5/extensions/regress-335700.js
+js1_5/extensions/regress-347306-02.js
+js1_5/String/regress-314890.js
+js1_5/String/regress-56940-01.js
+js1_5/String/regress-322772.js
+js1_5/String/regress-157334-01.js
+js1_5/String/regress-56940-02.js
+js1_5/Regress/regress-347306-01.js
+js1_5/Regress/regress-313967-02.js
+js1_5/Regress/regress-169559.js
+js1_5/Regress/regress-313967-01.js
+js1_5/Array/regress-99120-01.js
+js1_5/Array/regress-99120-02.js

js/tests/shell.js

@@ -39,6 +39,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Spidermonkey shell now defaults to 1.8, so set the basic version to
+// 1.5 for backwards compatibility.
+
+if (typeof version != 'undefined')
+{
+  version(150);
+}
+
 var FAILED = "FAILED!: ";
 var STATUS = "STATUS: ";
 var VERBOSE = false;
@@ -146,7 +154,7 @@ function TestCase(n, d, e, a)
 }
 
 TestCase.prototype.dump = function () {
-  dump('jstest: '      + this.path + ' ' +
+  dump('\njstest: '      + this.path + ' ' +
        'bug: '         + this.bugnumber + ' ' +
        'result: '      + (this.passed ? 'PASSED':'FAILED') + ' ' +
        'type: '        + this.type + ' ' +
@@ -223,7 +231,7 @@ function toPrinted(value)
   {
     value = String(value);
   }
-  value = value.replace(/\\n/g, '\\\\n').replace(/\n/g, '\\n');
+  value = value.replace(/\\n/g, 'NL').replace(/\n/g, 'NL').replace(/\\r/g, 'CR');
   return value;
 }
 

js/tests/spidermonkey-extensions-n.tests

@@ -158,6 +158,12 @@ js1_5/extensions/regress-355820.js
 js1_5/extensions/regress-355982.js
 js1_5/extensions/regress-356085.js
 js1_5/extensions/regress-356402.js
+js1_5/extensions/regress-358594-01.js
+js1_5/extensions/regress-358594-02.js
+js1_5/extensions/regress-358594-03.js
+js1_5/extensions/regress-358594-04.js
+js1_5/extensions/regress-358594-05.js
+js1_5/extensions/regress-358594-06.js
 js1_5/extensions/regress-361346.js
 js1_5/extensions/regress-361360.js
 js1_5/extensions/regress-361552.js
@@ -190,7 +196,15 @@ js1_5/extensions/regress-369404.js
 js1_5/extensions/regress-372309.js
 js1_5/extensions/regress-374589.js
 js1_5/extensions/regress-375183.js
+js1_5/extensions/regress-375801.js
 js1_5/extensions/regress-376052.js
+js1_5/extensions/regress-380581.js
+js1_5/extensions/regress-380831.js
+js1_5/extensions/regress-380889.js
+js1_5/extensions/regress-381205.js
+js1_5/extensions/regress-381211.js
+js1_5/extensions/regress-382509.js
+js1_5/extensions/regress-383965.js
 js1_5/extensions/regress-44009.js
 js1_5/extensions/regress-50447-1.js
 js1_5/extensions/regress-50447.js
@@ -239,7 +253,14 @@ js1_7/extensions/regress-363040-01.js
 js1_7/extensions/regress-363040-02.js
 js1_7/extensions/regress-366668-01.js
 js1_7/extensions/regress-366668-02.js
+js1_7/extensions/regress-367629.js
 js1_7/extensions/regress-368213.js
 js1_7/extensions/regress-368224.js
 js1_7/extensions/regress-372364.js
+js1_7/extensions/regress-379482.js
+js1_7/extensions/regress-379566.js
+js1_7/extensions/regress-380933.js
+js1_7/extensions/regress-381301.js
+js1_7/extensions/regress-381303.js
+js1_8/extensions/regress-300079.js
 js1_8/extensions/regress-378789.js

js/tests/test-browser.sh

@@ -5,10 +5,12 @@ TEST_DIR=${TEST_DIR:-/work/mozilla/mozilla.com/test.mozilla.com/www}
 TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}
 source ${TEST_BIN}/library.sh
 
+TEST_JSDIR=${TEST_JSDIR:-$TEST_DIR/tests/mozilla.org/js}
+
 TEST_JSEACH_TIMEOUT=${TEST_JSEACH_TIMEOUT:-240}
 TEST_JSEACH_PAGE_TIMEOUT=${TEST_JSEACH_PAGE_TIMEOUT:-240}
 
-TEST_WWW_JS=`pwd|sed "s|$TEST_DIR||"`
+TEST_WWW_JS=`echo $TEST_JSDIR|sed "s|$TEST_DIR||"`
 #
 # options processing
 #
@@ -60,8 +62,6 @@ if [[ -z "$product" || -z "$branch" || -z "$executablepath" || -z "$profilename"
     usage
 fi
 
-make
-
 executable=`get_executable $product $branch $executablepath`
 
 case "$branch" in 
@@ -76,9 +76,13 @@ case "$branch" in
         ;;
 esac
 
+pushd $TEST_JSDIR
+
+make
+
 cat "$list" | while read url; do 
 	edit-talkback.sh -p "$product" -b "$branch" -x "$executablepath" -i "$url"
-	time timed_run $TEST_JSEACH_TIMEOUT "$url" \
+	time timed_run.py $TEST_JSEACH_TIMEOUT "$url" \
 		"$executable" -P "$profilename" \
 		-spider -start -quit \
 		-uri "$url" \
@@ -86,7 +90,4 @@ cat "$list" | while read url; do
 		-hook "http://$TEST_HTTP$TEST_WWW_JS/userhookeach.js"; 
 done
 
-
-
-
-
+popd

js/tests/test-shell.sh

@@ -5,6 +5,8 @@ TEST_DIR=${TEST_DIR:-/work/mozilla/mozilla.com/test.mozilla.com/www}
 TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}
 source ${TEST_BIN}/library.sh
 
+TEST_JSDIR=${TEST_JSDIR:-$TEST_DIR/tests/mozilla.org/js}
+
 TEST_JSSHELL_TIMEOUT=${TEST_JSSHELL_TIMEOUT:-240}
 
 #
@@ -50,6 +52,8 @@ if [[ -z "$branch" || -z "$sourcepath" || -z "$buildtype" ]]; then
     usage
 fi
 
+pushd $TEST_JSDIR
+
 . config.sh
 
 executable="$sourcepath/$JS_OBJDIR/js$EXE_EXT"
@@ -66,7 +70,9 @@ case "$branch" in
         ;;
 esac
 
-TEST_HTML_LOG="${TEST_DIR}/results/mozilla.org/js/${TEST_DATE},js,$branch,$buildtype,$OSID,${MACHINE},$TEST_ID-shell.html"
+TEST_HTML_LOG="${TEST_DIR}/results/mozilla.org/js/${TEST_DATE},js,$branch,$buildtype,$OSID,${TEST_MACHINE},$TEST_SUITE-shell.html"
+
+make
 
 time perl jsDriver.pl \
     -l $included \
@@ -78,3 +84,4 @@ time perl jsDriver.pl \
 	-f $TEST_HTML_LOG \
     -Q
 
+popd

js/tests/test.sh

@@ -5,6 +5,8 @@ TEST_DIR=${TEST_DIR:-/work/mozilla/mozilla.com/test.mozilla.com/www}
 TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}
 source ${TEST_BIN}/library.sh
 
+TEST_JSDIR=${TEST_JSDIR:-$TEST_DIR/tests/mozilla.org/js}
+
 #
 # options processing
 #
@@ -47,8 +49,8 @@ for data in $datafiles; do
 done
 
 case "$product" in
-    firefox) testscript=./test-browser.sh;;
-    js) testscript=./test-shell.sh;;
+    firefox) testscript=$TEST_JSDIR/test-browser.sh;;
+    js) testscript=$TEST_JSDIR/test-shell.sh;;
     *) echo "unknown product [$product]"
         exit 2
         ;;