From 9257afaec7f8086350b4d833e30966a3ef2471c1 Mon Sep 17 00:00:00 2001
From: "bclary%bclary.com"
 <bclary%bclary.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 5 Sep 2008 10:17:06 +0000
Subject: [PATCH] Sisyphus - JavaScript Tests - add jit options for browser
 tests, bug 453798

git-svn-id: svn://10.0.0.236/trunk@254045 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/tests/browser.js | 14 ++++++++++++++
 mozilla/js/tests/test.sh    |  9 +++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/mozilla/js/tests/browser.js b/mozilla/js/tests/browser.js
index bc54502616e..88daa0bbaec 100755
--- a/mozilla/js/tests/browser.js
+++ b/mozilla/js/tests/browser.js
@@ -568,6 +568,13 @@ function gczeal(z)
   javascriptoptions.setIntPref('gczeal', Number(z));
 }
 
+function jit()
+{
+  var javascriptoptions = new Preferences('javascript.options.jit.');
+  javascriptoptions.setBoolPref('content', true);
+  javascriptoptions.setBoolPref('chrome', true);
+}
+
 var gVersion = 150;
 
 function jsTestDriverBrowserInit()
@@ -609,6 +616,13 @@ function jsTestDriverBrowserInit()
     gczeal(zeal);
   }
 
+  var jitmatches = /;jit/.exec(document.location.search);
+
+  if (jitmatches)
+  {
+    jit();
+  }
+
   var versionmatches = /version=([.0-9]*)/.exec(value);
 
   if (!versionmatches)
diff --git a/mozilla/js/tests/test.sh b/mozilla/js/tests/test.sh
index a893329ee44..c8f272abaa6 100755
--- a/mozilla/js/tests/test.sh
+++ b/mozilla/js/tests/test.sh
@@ -166,7 +166,8 @@ if [[ -n "$javascriptoptions" ]]; then
                 splitobjects="-z"
                 ;;
             j)
-                jit="-j"
+                jitshell="-j"
+                jitbrowser=";jit"
                 ;;
         esac
     done
@@ -416,7 +417,7 @@ case $testtype in
                     -S 524288 \
                     $gczealshell \
                     $splitobjects \
-                    $jit \
+                    $jitshell \
                     -f ./shell.js \
                     -f $suitetestdir/shell.js \
                     -f $subsuitetestdir/shell.js \
@@ -469,8 +470,8 @@ EOF
 
                 version=";version=`browserfileversion $jsfile`"
                 
-                echo "http://$TEST_HTTP/$TEST_WWW_JS/js-test-driver-standards.html?test=$jsfile;language=type;text/javascript$version$gczealbrowser" >> $urllist
-                echo "<li><a href='http://$TEST_HTTP/$TEST_WWW_JS/js-test-driver-standards.html?test=$jsfile;language=type;text/javascript$version$gczealbrowser'>$jsfile</a></li>" >> $urlhtml
+                echo "http://$TEST_HTTP/$TEST_WWW_JS/js-test-driver-standards.html?test=$jsfile;language=type;text/javascript$version$gczealbrowser$jitbrowser" >> $urllist
+                echo "<li><a href='http://$TEST_HTTP/$TEST_WWW_JS/js-test-driver-standards.html?test=$jsfile;language=type;text/javascript$version$gczealbrowser$jitbrowser'>$jsfile</a></li>" >> $urlhtml
             fi
         done