andreasgal / dom.js Goto Github PK

    // DOMCore says that documents are always associated with themselves.
    this.ownerDocument = this;

host-4-64:mozilla-central donovan$ hg diff
diff -r a690d8fbcc48 js/src/shell/js.cpp
--- a/js/src/shell/js.cpp   Mon Aug 08 17:21:29 2011 -0400
+++ b/js/src/shell/js.cpp   Tue Aug 09 10:02:38 2011 -0700
@@ -5678,9 +5678,25 @@
     return true;
 }

+
+JSTrapStatus
+CoverageHook(JSContext *cx, JSScript *script,
+             jsbytecode *pc, jsval *rval, void *closure)
+{
+    fprintf((FILE *)closure, "%s ---------- %d\n",
+            JS_GetScriptFilename(cx, script),
+            JS_PCToLineNumber(cx, script, pc));
+   fflush((FILE *)closure);
+
+    return JSTRAP_CONTINUE;
+}
+
+
 static int
 ProcessArgs(JSContext *cx, JSObject *obj, OptionParser *op)
 {
+    FILE * coverage_file = NULL;
+
     if (op->getBoolOption('a'))
         JS_ToggleOptions(cx, JSOPTION_METHODJIT_ALWAYS);

@@ -5689,6 +5705,15 @@
         JS_ToggleOptions(cx, JSOPTION_METHODJIT);
     }

+    if (op->getBoolOption('c')) {
+       char filename[256];
+       // We open this file but never close it. Since we use it until the process dies,
+       // we don't really need to close it. Messy, but the code to close the file
+       // properly was messier.
+        coverage_file = fopen("coverage.out", "a");
+        JS_SetInterrupt(cx->runtime, &CoverageHook, coverage_file);
+    }
+
 #ifdef JS_GC_ZEAL
     if (const char *zeal = op->getStringOption('Z'))
         ParseZealArg(cx, zeal);
@@ -5957,6 +5982,7 @@
     if (!op.addMultiStringOption('f', "file", "PATH", "File path to run")
         || !op.addMultiStringOption('e', "execute", "CODE", "Inline code to run")
         || !op.addBoolOption('i', "shell", "Enter prompt after running code")
+        || !op.addBoolOption('c', "coverage", "Write filenames and line numbers of executed code to coverage.out")
         || !op.addBoolOption('m', "methodjit", "Enable the JaegerMonkey method JIT")
         || !op.addBoolOption('j', "tracejit", "Enable the JaegerMonkey trace JIT")
         || !op.addBoolOption('p', "profiling", "Enable runtime profiling select JIT mode")
diff -r a690d8fbcc48 js/src/tests/jstests.py
--- a/js/src/tests/jstests.py   Mon Aug 08 17:21:29 2011 -0400
+++ b/js/src/tests/jstests.py   Tue Aug 09 10:02:38 2011 -0700
@@ -241,6 +241,8 @@
                   help='extra args to pass to valgrind')
     op.add_option('-c', '--check-manifest', dest='check_manifest', action='store_true',
                   help='check for test files not listed in the manifest')
+    op.add_option('-C', '--coverage', dest='coverage', action='store_true',
+                  help='gather data on which lines were executed while running tests.')
     op.add_option('--failure-file', dest='failure_file',
                   help='write tests that have not passed to the given file')
     op.add_option('--run-slow-tests', dest='run_slow_tests', action='store_true',
@@ -276,6 +278,10 @@
     else:
         debugger_prefix = []

+    if OPTIONS.coverage:
+        ## If gathering coverage tell spidermonkey to record coverage
+        OPTIONS.shell_args += ' -c'
+
     TestTask.set_js_cmd_prefix(JS, OPTIONS.shell_args.split(), debugger_prefix)

     output_file = sys.stdout