Title: [230093] trunk/Tools
- Revision
- 230093
- Author
- ross.kirsl...@sony.com
- Date
- 2018-03-29 21:35:07 -0700 (Thu, 29 Mar 2018)
Log Message
run-jsc-benchmarks should recognize Windows-style build directory structure.
https://bugs.webkit.org/show_bug.cgi?id=184117
Reviewed by Yusuke Suzuki.
* Scripts/run-jsc-benchmarks:
Allow not only bin/jsc but also bin64/jsc.exe.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (230092 => 230093)
--- trunk/Tools/ChangeLog 2018-03-30 04:16:30 UTC (rev 230092)
+++ trunk/Tools/ChangeLog 2018-03-30 04:35:07 UTC (rev 230093)
@@ -1,3 +1,13 @@
+2018-03-29 Ross Kirsling <ross.kirsl...@sony.com>
+
+ run-jsc-benchmarks should recognize Windows-style build directory structure.
+ https://bugs.webkit.org/show_bug.cgi?id=184117
+
+ Reviewed by Yusuke Suzuki.
+
+ * Scripts/run-jsc-benchmarks:
+ Allow not only bin/jsc but also bin64/jsc.exe.
+
2018-03-29 Zalan Bujtas <za...@apple.com>
[LayoutReloaded] Decouple formatting state and context lifetime.
Modified: trunk/Tools/Scripts/run-jsc-benchmarks (230092 => 230093)
--- trunk/Tools/Scripts/run-jsc-benchmarks 2018-03-30 04:16:30 UTC (rev 230092)
+++ trunk/Tools/Scripts/run-jsc-benchmarks 2018-03-30 04:35:07 UTC (rev 230093)
@@ -1342,10 +1342,10 @@
@libPath, @relativeBinPath = [$~.pre_match+"/Release"], "./#{$1}"
elsif @path =~ /\/Debug\/([a-zA-Z]+)$/
@libPath, @relativeBinPath = [$~.pre_match+"/Debug"], "./#{$1}"
- elsif @path =~ /\/Release\/bin\/([a-zA-Z]+)$/
- @libPath, @relativeBinPath = [$~.pre_match+"/Release/lib"], "./#{$1}"
- elsif @path =~ /\/Debug\/bin\/([a-zA-Z]+)$/
- @libPath, @relativeBinPath = [$~.pre_match+"/Debug/lib"], "./#{$1}"
+ elsif @path =~ /\/Release\/bin(64|32|)\/([\.a-zA-Z]+)$/
+ @libPath, @relativeBinPath = [$~.pre_match+"/Release/lib#{$1}"], "./#{$2}"
+ elsif @path =~ /\/Debug\/bin(64|32|)\/([\.a-zA-Z]+)$/
+ @libPath, @relativeBinPath = [$~.pre_match+"/Debug/lib#{$1}"], "./#{$2}"
elsif @path =~ /\/Contents\/Resources\/([a-zA-Z]+)$/
@libPath = [$~.pre_match + "/Contents/Resources", $~.pre_match + "/Contents/Frameworks"]
elsif @path =~ /\/_javascript_Core.framework\/Resources\/([a-zA-Z]+)$/
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
