Title: [262837] trunk/Tools
- Revision
- 262837
- Author
- commit-qu...@webkit.org
- Date
- 2020-06-10 04:18:27 -0700 (Wed, 10 Jun 2020)
Log Message
Unreviewed, reverting r262807.
https://bugs.webkit.org/show_bug.cgi?id=213019
It is breaking JSC queues (Requested by caiolima on #webkit).
Reverted changeset:
"Add a timeout monitor for JSC stress test"
https://bugs.webkit.org/show_bug.cgi?id=211978
https://trac.webkit.org/changeset/262807
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (262836 => 262837)
--- trunk/Tools/ChangeLog 2020-06-10 07:34:47 UTC (rev 262836)
+++ trunk/Tools/ChangeLog 2020-06-10 11:18:27 UTC (rev 262837)
@@ -1,3 +1,16 @@
+2020-06-10 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r262807.
+ https://bugs.webkit.org/show_bug.cgi?id=213019
+
+ It is breaking JSC queues (Requested by caiolima on #webkit).
+
+ Reverted changeset:
+
+ "Add a timeout monitor for JSC stress test"
+ https://bugs.webkit.org/show_bug.cgi?id=211978
+ https://trac.webkit.org/changeset/262807
+
2020-06-09 Fujii Hironori <hironori.fu...@sony.com>
Unreviewed, reverting r262791.
Modified: trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb (262836 => 262837)
--- trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb 2020-06-10 07:34:47 UTC (rev 262836)
+++ trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb 2020-06-10 11:18:27 UTC (rev 262837)
@@ -232,40 +232,7 @@
end
@additionalEnv = []
end
-
- def timeoutMonitorAddon
- # In case the JSC timeout handler is not working, add a timeout monitor in the script
- interval = 30 # Seconds
- timeout = ENV['JSCTEST_timeout'].to_i + 10 # Let jsc timeout handler trigger first
- if !timeout
- timeout = interval
- end
- if timeout < interval
- interval = timeout
- end
- script = %Q[
-(
- ((count_down = #{timeout}))
- while ((count_down > 0)); do
- if [ "$count_down" -gt #{interval} ]
- then
- sleep #{interval}
- else
- sleep count_down
- fi
- pgrep -P $$ 1>/dev/null || exit 0
- ((count_down -= #{interval}))
- done
- echo "#{Shellwords.shellescape(@name)} has timed out, killing with timeout monitor"
- kill -s SIGTERM $$
- sleep 5
- pgrep -P 1>/dev/null $$ && kill -s SIGKILL $$
- echo FAIL: #{Shellwords.shellescape(@name)} ; touch #{failFile} ;
-) &
-]
- return script
- end
-
+
def shellCommand
# It's important to remember that the test is actually run in a subshell, so if we change directory
# in the subshell when we return we will be in our original directory. This is nice because we don't
@@ -321,8 +288,7 @@
outp.puts "START_TIME=$SECONDS"
end
outp.puts "echo Running #{Shellwords.shellescape(@name)}"
- cmd = timeoutMonitorAddon
- cmd += "(" + shellCommand + " || (echo $? > #{failFile})) 2>&1 "
+ cmd = "(" + shellCommand + " || (echo $? > #{failFile})) 2>&1 "
cmd += @outputHandler.call(@name)
if $verbosity >= 3
outp.puts "echo #{Shellwords.shellescape(cmd)}"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
