Commit bbca46f1 authored by ossy@webkit.org's avatar ossy@webkit.org

Make run-fast-jsc script bash, dash and Darwin's /bin/sh friendly

https://bugs.webkit.org/show_bug.cgi?id=120759

Reviewed by Filip Pizlo.

* Scripts/run-fast-jsc: Remove bashisms to make bash, dash and Darwin's /bin/sh happy.
* Scripts/run-javascriptcore-tests: Enable run-fast-jsc tests everywhere, except Windows.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155118 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 54053ee5
2013-09-05 Csaba Osztrogonác <ossy@webkit.org>
Make run-fast-jsc script bash, dash and Darwin's /bin/sh friendly
https://bugs.webkit.org/show_bug.cgi?id=120759
Reviewed by Filip Pizlo.
* Scripts/run-fast-jsc: Remove bashisms to make bash, dash and Darwin's /bin/sh happy.
* Scripts/run-javascriptcore-tests: Enable run-fast-jsc tests everywhere, except Windows.
2013-09-05 Filip Pizlo <fpizlo@apple.com>
Unreviewed, green the Mac bots by boosting the timeout on JSC tests. One of the
......
......@@ -32,7 +32,7 @@ testList="unset"
cmdName=`basename $0`
function usage()
usage()
{
echo "usage: $cmdName [[--jsc | -j] <path-to-jsc>] [[--results-dir | -r] <results-path>]"
echo " [[--test-root | -t] <test-root-path>] [[--test-list | -l] <test-list-file>]"
......@@ -108,8 +108,12 @@ do
if [ -f $expectedOut -a -f $jsTest ]
then
echo "Testing $test ... \c"
let numTestsRun=$numTestsRun+1
if [ `uname` = 'Darwin' ]; then
echo "Testing $test ... \c"
else
echo -n "Testing $test ..."
fi
numTestsRun=$(($numTestsRun+1))
$jscCmd $preScript $jsTest $postScript 2>$actualErr > $actualOut
JSC_RES=$?
......@@ -138,14 +142,14 @@ do
if [ $testPassed -eq 1 ]
then
echo "$test" >> $passList
let numPassed=$numPassed+1
numPassed=$(($numPassed+1))
else
echo "$test" >> $failList
let numFailed=$numFailed+1
numFailed=$(($numFailed+1))
if [ $testCrashed -eq 1 ]
then
echo "$test" >> $crashList
let numCrashed=$numCrashed+1
numCrashed=$(($numCrashed+1))
fi
fi
fi
......
......@@ -191,7 +191,11 @@ close ACTUAL;
chdirWebKit();
my $fastJSResultsDir = $productDir . "/fast-jsc-results";
my $runFastJS = isAppleMacWebKit();
# FIXME: run-fast-jsc tests doesn't work properly on Windows
# https://bugs.webkit.org/show_bug.cgi?id=120765
my $runFastJS = !isAppleWinWebKit();
if ($runFastJS) {
# Run the fast/js tests.
my @fastJSDriverCmd = ("/bin/sh", "Tools/Scripts/run-fast-jsc", "-j", jscPath($productDir), "-r", $fastJSResultsDir, "-t", "LayoutTests");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment