Title: [169156] trunk/Tools
- Revision
- 169156
- Author
- o...@webkit.org
- Date
- 2014-05-21 05:01:42 -0700 (Wed, 21 May 2014)
Log Message
REGRESSION(r169092): It broke run-jsc-stress tests on non Mac platforms
https://bugs.webkit.org/show_bug.cgi?id=133145
Patch by Eva Balazsfalvi <evab.u-sze...@partner.samsung.com> on 2014-05-21
Reviewed by Csaba Osztrogonác.
* Scripts/run-jsc-stress-tests:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (169155 => 169156)
--- trunk/Tools/ChangeLog 2014-05-21 11:55:30 UTC (rev 169155)
+++ trunk/Tools/ChangeLog 2014-05-21 12:01:42 UTC (rev 169156)
@@ -1,3 +1,12 @@
+2014-05-21 Eva Balazsfalvi <evab.u-sze...@partner.samsung.com>
+
+ REGRESSION(r169092): It broke run-jsc-stress tests on non Mac platforms
+ https://bugs.webkit.org/show_bug.cgi?id=133145
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/run-jsc-stress-tests:
+
2014-05-20 Alexey Proskuryakov <a...@apple.com>
[Mac] WebProcess doesn't follow localization of UI process when run as a service
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (169155 => 169156)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-05-21 11:55:30 UTC (rev 169155)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-05-21 12:01:42 UTC (rev 169156)
@@ -178,13 +178,17 @@
# Try to determine architecture. Return nil on failure.
def machOArchitectureCode
- otoolLines = `otool -aSfh #{Shellwords.shellescape($jscPath.to_s)}`.split("\n")
- otoolLines.each_with_index {
- | value, index |
- if value =~ /magic/ and value =~ /cputype/
- return otoolLines[index + 1].split[1].to_i
- end
- }
+ begin
+ otoolLines = `otool -aSfh #{Shellwords.shellescape($jscPath.to_s)}`.split("\n")
+ otoolLines.each_with_index {
+ | value, index |
+ if value =~ /magic/ and value =~ /cputype/
+ return otoolLines[index + 1].split[1].to_i
+ end
+ }
+ rescue
+ $stderr.puts "Warning: unable to execute otool."
+ end
$stderr.puts "Warning: unable to determine architecture."
nil
end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
