Title: [155118] trunk/Tools
- Revision
- 155118
- Author
- [email protected]
- Date
- 2013-09-05 08:11:58 -0700 (Thu, 05 Sep 2013)
Log Message
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-_javascript_core-tests: Enable run-fast-jsc tests everywhere, except Windows.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (155117 => 155118)
--- trunk/Tools/ChangeLog 2013-09-05 15:01:12 UTC (rev 155117)
+++ trunk/Tools/ChangeLog 2013-09-05 15:11:58 UTC (rev 155118)
@@ -1,3 +1,13 @@
+2013-09-05 Csaba Osztrogonác <[email protected]>
+
+ 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-_javascript_core-tests: Enable run-fast-jsc tests everywhere, except Windows.
+
2013-09-05 Filip Pizlo <[email protected]>
Unreviewed, green the Mac bots by boosting the timeout on JSC tests. One of the
Modified: trunk/Tools/Scripts/run-fast-jsc (155117 => 155118)
--- trunk/Tools/Scripts/run-fast-jsc 2013-09-05 15:01:12 UTC (rev 155117)
+++ trunk/Tools/Scripts/run-fast-jsc 2013-09-05 15:11:58 UTC (rev 155118)
@@ -32,7 +32,7 @@
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 @@
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 @@
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
Modified: trunk/Tools/Scripts/run-_javascript_core-tests (155117 => 155118)
--- trunk/Tools/Scripts/run-_javascript_core-tests 2013-09-05 15:01:12 UTC (rev 155117)
+++ trunk/Tools/Scripts/run-_javascript_core-tests 2013-09-05 15:11:58 UTC (rev 155118)
@@ -191,7 +191,11 @@
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");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
