Backed out changeset 368fb0c5a339 due to jsreftest breakage.

js/src/Makefile.in

@@ -570,11 +570,11 @@ endif
 ifdef ENABLE_TRACEJIT
 ifndef WINCE
 check::
-	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/jit-test/jit_test.py \
+	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/trace-test/trace_test.py \
 	        --no-slow --no-progress --tinderbox $(DIST)/bin/js$(BIN_SUFFIX)
 
 check-valgrind::
-	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/jit-test/jit_test.py \
+	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/trace-test/trace_test.py \
 	        --valgrind --no-slow --no-progress --tinderbox $(DIST)/bin/js$(BIN_SUFFIX)
 endif
 endif

js/src/jit-test/tests/basic/bug601395.js

@@ -1,2 +0,0 @@
-// |jit-test| error: SyntaxError;
-let(y = let(d = []) u, x

js/src/jit-test/tests/basic/bug601428.js

@@ -1,2 +0,0 @@
-// |jit-test| error: SyntaxError;
-let({}=[c for(x in[])]){let

js/src/jit-test/tests/basic/testBoolToString.js

@@ -1,3 +0,0 @@
-// |jit-test| error: TypeError;
-var bts = true.toString;
-bts();

js/src/jit-test/tests/jaeger/bug549603.js

@@ -1,3 +0,0 @@
-// |jit-test| error: ReferenceError
-x ? o : [] && x
-

js/src/jit-test/tests/jaeger/bug580883.js

@@ -1,6 +0,0 @@
-// |jit-test| error: invalid sharp variable use #1#
-[] = #1#
-with(7) {
-    var c
-}
-

js/src/jit-test/tests/jaeger/bug582900.js

@@ -1,3 +0,0 @@
-// |jit-test| error: ReferenceError
-
-[].x >>= a | 0

js/src/jit-test/tests/jaeger/modWithConstLhs.js

@@ -1,2 +0,0 @@
-// |jit-test| error: ReferenceError;
-7%s;

js/src/jitstats.tbl

@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/* NB: Keep this list synced with jitstatHandler in jit-test.js. */
+/* NB: Keep this list synced with jitstatHandler in trace-test.js. */
 /**
  * Proper use of this file: Consumers must define JITSTAT; they can optionally
  * also define MONITOR_JITSTAT or RECORDER_JITSTAT or both to do separate

js/src/methodjit/BytecodeAnalyzer.cpp

@@ -248,7 +248,7 @@ BytecodeAnalyzer::analyze(uint32 index)
              *   leaveblock 1
              *   retrval
              *   leaveblock 1
-             * (see testNullCallee in jit-tests)
+             * (see testNullCallee in trace-tests)
              */
             JS_ASSERT(js_CodeSpec[op].length == 1);
             uint32 offs = (pc + 1) - script->code;

js/src/metrics/jint/treesearch.py

@@ -387,7 +387,7 @@ if __name__ == '__main__':
     lib_dir = os.path.join(script_dir, 'lib')
 
     # The [TESTS] optional arguments are paths of test files relative
-    # to the jit-test/tests directory.
+    # to the trace-test/tests directory.
 
     from optparse import OptionParser
     op = OptionParser(usage='%prog [options] JS_SHELL test')

js/src/tests/js1_8_1/trace/jstests.list

@@ -1,5 +1,5 @@
 url-prefix ../../jsreftest.html?test=js1_8_1/trace/
-script math-jit-tests.js
+script math-trace-tests.js
 skip script regress-451673.js # bogus perf test (bug 540512)
 skip script regress-451974-01.js # bogus perf test (bug 540512)
 skip script regress-451974-02.js # bogus perf test (bug 540512)

js/src/tests/js1_8_5/extensions/reflect-parse.js

@@ -173,7 +173,7 @@ function assertError(src, errorType) {
 
 // general tests
 
-// NB: These are useful but for now jit-test doesn't do I/O reliably.
+// NB: These are useful but for now trace-test doesn't do I/O reliably.
 
 //program(_).assert(Reflect.parse(snarf('data/flapjax.txt')));
 //program(_).assert(Reflect.parse(snarf('data/jquery-1.4.2.txt')));

js/src/tests/narcissus-failures.txt

@@ -1346,9 +1346,9 @@ js1_8_1/regress/regress-530879.js
 js1_8_1/strict/12.2.1.js
 js1_8_1/strict/generator-eval-arguments.js
 js1_8_1/strict/let-block-eval-arguments.js
-js1_8_1/trace/math-jit-tests.js
+js1_8_1/trace/math-trace-tests.js
 js1_8_1/trace/testDeepBailFromNonNative.js
-js1_8_1/trace/jit-test.js
+js1_8_1/trace/trace-test.js
 js1_8_5/extensions/censor-strict-caller.js
 js1_8_5/extensions/destructure-accessor.js
 js1_8_5/extensions/reflect-parse.js

js/src/trace-test/README

@@ -13,7 +13,7 @@ Python 2.5. This is already a standard requirement for building our tree.
 
 Basic usage:
 
-    python jit_test.py <path-to-js-shell>
+    python trace_test.py <path-to-js-shell>
 
 The progress bar shows [#tests passed, #tests failed, #tests run] at the left.
 If all tests pass, the output is 'PASSED ALL'. The test suite can be interrupted
@@ -21,11 +21,11 @@ at any time with Ctrl+C and partial results will be printed.
 
 To run only the basic tests, not including the slow tests:
 
-    python jit_test.py <path-to-js-shell> basic
+    python trace_test.py <path-to-js-shell> basic
 
 For more options:
 
-    python jit_test.py -h
+    python trace_test.py -h
 
 * CREATING NEW TESTS
 
@@ -44,12 +44,12 @@ test case:
 The first line of a test case can contain a special comment controlling how the
 test is run. For example:
 
-    // |jit-test| allow-oom;
+    // |trace-test| allow-oom;
 
 The general format in EBNF is:
 
     metaline  ::= cookie { item ";" }
-    cookie    ::= "|jit-test|"
+    cookie    ::= "|trace-test|"
     item      ::= flag | attribute
 
     flag      ::= "slow" | "allow-oom"