Title: [155385] trunk
- Revision
- 155385
- Author
- [email protected]
- Date
- 2013-09-09 14:47:23 -0700 (Mon, 09 Sep 2013)
Log Message
Unreviewed, fix Ruby exception handling.
* Scripts/run-jsc-stress-tests:
Modified Paths
Diff
Modified: trunk/LayoutTests/fast/js/script-tests/dfg-exception.js (155384 => 155385)
--- trunk/LayoutTests/fast/js/script-tests/dfg-exception.js 2013-09-09 21:36:54 UTC (rev 155384)
+++ trunk/LayoutTests/fast/js/script-tests/dfg-exception.js 2013-09-09 21:47:23 UTC (rev 155385)
@@ -74,8 +74,11 @@
return x();
};
+noInline(test);
+noInline(doesntDFGCompile);
+
// warmup the test method
-for (i = 0; i < 200; ++i)
+while (!dfgCompiled({f:test}))
test(doesntDFGCompile);
//
Modified: trunk/Tools/ChangeLog (155384 => 155385)
--- trunk/Tools/ChangeLog 2013-09-09 21:36:54 UTC (rev 155384)
+++ trunk/Tools/ChangeLog 2013-09-09 21:47:23 UTC (rev 155385)
@@ -1,5 +1,11 @@
2013-09-09 Filip Pizlo <[email protected]>
+ Unreviewed, fix Ruby exception handling.
+
+ * Scripts/run-jsc-stress-tests:
+
+2013-09-09 Filip Pizlo <[email protected]>
+
Stress tests should test the jsc profiler (-p)
https://bugs.webkit.org/show_bug.cgi?id=121043
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (155384 => 155385)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2013-09-09 21:36:54 UTC (rev 155384)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2013-09-09 21:47:23 UTC (rev 155385)
@@ -39,7 +39,7 @@
begin
require 'shellwords'
$haveShellwords = true
-rescue => e
+rescue Exception => e
$stderr.puts "Warning: did not find shellwords; some features will be disabled."
$stderr.puts "Error: #{e.inspect}"
end
@@ -50,7 +50,7 @@
require 'json'
require 'highline'
$canRunDisplayProfilerOutput = true
-rescue => e
+rescue Exception => e
$stderr.puts "Warning: did not find json or highline; some features will be disabled."
$stderr.puts "Error: #{e.inspect}"
end
@@ -198,6 +198,7 @@
if $haveShellwords and $canRunDisplayProfilerOutput
addRunCommand("profiler", ["ruby", (HELPERS_PATH + "profiler-test-helper").to_s, (SCRIPTS_PATH + "display-profiler-output").to_s, profilerOutput.to_s, $jscPath.to_s, "-p", profilerOutput.to_s, $benchmark.to_s])
else
+ puts "Running simple version of #{$collectionName}/#{$benchmark} because some required Ruby features are unavailable."
run("profiler-simple", "-p", profilerOutput.to_s)
end
end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
