b=474517; add option for trace-test to skip slow tests; r=shaver
authorVladimir Vukicevic <vladimir@pobox.com>
Tue, 03 Feb 2009 21:11:09 -0800
changeset 24617 aa22b82b1977347bbff51290da189ff5d839be39
parent 24616 4ed96133d9cbd7cda555d2a9ef481090816eb759
child 24618 1f3874ec0cb04331f7de4a7deef7ad57b3b651da
push id5132
push userrsayre@mozilla.com
push dateWed, 04 Feb 2009 20:48:09 +0000
treeherdermozilla-central@76ca30e94e5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersshaver
bugs474517
milestone1.9.2a1pre
b=474517; add option for trace-test to skip slow tests; r=shaver
js/src/trace-test.js
--- a/js/src/trace-test.js
+++ b/js/src/trace-test.js
@@ -8,16 +8,22 @@
 // object in debug builds.
 const haveTracemonkey = !!(this.tracemonkey)
 const HOTLOOP = haveTracemonkey ? tracemonkey.HOTLOOP : 2;
 // The loop count at which we trace
 const RECORDLOOP = HOTLOOP;
 // The loop count at which we run the trace
 const RUNLOOP = HOTLOOP + 1;
 
+var gDoMandelbrotTest = true;
+if ("gSkipSlowTests" in this && gSkipSlowTests) {
+    print("** Skipping slow tests");
+    gDoMandelbrotTest = false;
+}
+
 var testName = null;
 if ("arguments" in this && arguments.length > 0)
   testName = arguments[0];
 var fails = [], passes=[];
 
 function jitstatHandler(f)
 {
     if (!haveTracemonkey)
@@ -4259,16 +4265,17 @@ test(testInterpreterReentery8);
  *****************************************************************************/
 
 load("math-trace-tests.js");
 
 // BEGIN MANDELBROT STUFF
 // XXXbz I would dearly like to wrap it up into a function to avoid polluting
 // the global scope, but the function ends up heavyweight, and then we lose on
 // the jit.
+if (gDoMandelbrotTest) {
 load("mandelbrot-results.js");
 //function testMandelbrotAll() {
   // Configuration options that affect which codepaths we follow.
   var doImageData = true;
   var avoidSparseArray = true;
 
   // Control of iteration numbers and sizing.  We'll do
   // scaler * colorNames.length iterations or so before deciding that we
@@ -4502,16 +4509,17 @@ load("mandelbrot-results.js");
   avoidSparseArray = false;
   test(createMandelSet);
 
   escape = escapeNorm2;
   doImageData = false;  // avoidSparseArray doesn't matter here
   test(createMandelSet);
 //}
 //testMandelbrotAll();
+} /* if (gDoMandelbrotTest) */
 // END MANDELBROT STUFF
 
 /*****************************************************************************
  *  _   _  ____     _   __  ____  _____  ______                              *
  * | \ | |/ __ \   |  \/  |/ __ \|  __ \|  ____|                             *
  * |  \| | |  | |  | \  / | |  | | |__) | |__                                *
  * | . ` | |  | |  | |\/| | |  | |  _  /|  __|                               *
  * | |\  | |__| |  | |  | | |__| | | \ \| |____                              *