Changeset 205387 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Sep 2, 2016, 5:12:16 PM (9 years ago)

Author:

[email protected]

Message:

Import Chakra tests to JSC
​https://bugs.webkit.org/show_bug.cgi?id=154697

Reviewed by Saam Barati.

Added Chakra tests. All these tests are under Chakra/test. This is the same layout
for tests in the Chakra tree.

Created a ChakraCore.yaml file to be used with run-jsc-stress-tests. This file contains
the tests that are run when the original Chakra runtests.py script is run. That script
is the test driver for *nix platforms and does not attempt to run all tests or all
variations of tests. The runtest.py driver consults rlexe.xml files in each test
subdirectory to determine the test to run, the options to pass to the test and how to
determine pass/fail of the test. With runtests.py as the start, tests that didn't
pass directly where either skipped, with a message describing why or through
adjustments to the test infrastructure, as described below, where made to pass.

The only modification to the test infrastrucutre are:

1) Added simple mapping of Chakra expected exception text to JSC expected text in

test/UnitTestFramework/UnitTestFramework.js. It would make sense to also
map some JSC specific exception text to more generic text for the cases where
that text contains indetifier names or other source specific strings and the
Chakra equivolent exception texts are generic.

2) Created JSC specific expected text files where it is clear that the text work

as expected on JSC but the test output is different. Typically the differences
fall into three categories, different exception output, different output from
toString() of a function, slight numeric differences, and test that rely on
iteration order.

3) Stripped the CR's from the CR-LF line terminations of the files.

No actual test .js files were modified.

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (8 diffs)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -700 +700 @@
     String m_profilerOutput;
     String m_uncaughtExceptionName;
+    bool m_alwaysDumpUncaughtException { false };
     bool m_dumpSamplingProfilerData { false };
 
@@ -2109 +2110 @@
 }
 
-static bool checkUncaughtException(VM& vm, GlobalObject* globalObject, JSValue exception, const String& expectedExceptionName)
+static bool checkUncaughtException(VM& vm, GlobalObject* globalObject, JSValue exception, const String& expectedExceptionName, bool alwaysDumpException)
 {
     vm.clearException();
@@ -2129 +2130 @@
         return false;
     }
-    if (isInstanceOfExpectedException)
+    if (isInstanceOfExpectedException) {
+        if (alwaysDumpException)
+            dumpException(globalObject, exception);
         return true;
+    }
 
     printf("Expected uncaught exception with name '%s' but exception value is not instance of this exception class\n", expectedExceptionName.utf8().data());
@@ -2137 +2141 @@
 }
 
-static bool runWithScripts(GlobalObject* globalObject, const Vector<Script>& scripts, const String& uncaughtExceptionName, bool dump, bool module)
+static bool runWithScripts(GlobalObject* globalObject, const Vector<Script>& scripts, const String& uncaughtExceptionName, bool alwaysDumpUncaughtException, bool dump, bool module)
 {
     String fileName;
@@ -2156 +2160 @@
                 dumpException(globalObject, value);
         } else
-            success = success && checkUncaughtException(vm, globalObject, (hasException) ? value : JSValue(), uncaughtExceptionName);
+            success = success && checkUncaughtException(vm, globalObject, (hasException) ? value : JSValue(), uncaughtExceptionName, alwaysDumpUncaughtException);
     };
 
@@ -2300 +2304 @@
     fprintf(stderr, "  --module-file=<file>       Parse and evaluate the given file as module (this option may be passed more than once)\n");
     fprintf(stderr, "  --exception=<name>         Check the last script exits with an uncaught exception with the specified name\n");
+    fprintf(stderr, "  --dumpException            Dump uncaught exception text\n");
     fprintf(stderr, "  --options                  Dumps all JSC VM options and exits\n");
     fprintf(stderr, "  --dumpOptions              Dumps all non-default JSC VM options before continuing\n");
@@ -2403 +2408 @@
         }
 
+        if (!strcmp(arg, "--dumpException")) {
+            m_alwaysDumpUncaughtException = true;
+            continue;
+        }
+
         static const unsigned exceptionStrLength = strlen("--exception=");
         if (!strncmp(arg, "--exception=", exceptionStrLength)) {
@@ -2453 +2463 @@
 
     GlobalObject* globalObject = GlobalObject::create(*vm, GlobalObject::createStructure(*vm, jsNull()), options.m_arguments);
-    bool success = runWithScripts(globalObject, options.m_scripts, options.m_uncaughtExceptionName, options.m_dump, options.m_module);
+    bool success = runWithScripts(globalObject, options.m_scripts, options.m_uncaughtExceptionName, options.m_alwaysDumpUncaughtException, options.m_dump, options.m_module);
     if (options.m_interactive && success)
         runInteractive(globalObject);