run-jsc-benchmarks doesn't work with internal benchmarks
authorggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Nov 2015 22:22:12 +0000 (22:22 +0000)
committerggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Nov 2015 22:22:12 +0000 (22:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=151047

Reviewed by Filip Pizlo.

* Scripts/run-jsc-benchmarks: Use Pathname so we get a "/" inserted when
we concatenate.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192271 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/run-jsc-benchmarks

index 8c24f57..92a41ee 100644 (file)
@@ -1,3 +1,13 @@
+2015-11-10  Geoffrey Garen  <ggaren@apple.com>
+
+        run-jsc-benchmarks doesn't work with internal benchmarks
+        https://bugs.webkit.org/show_bug.cgi?id=151047
+
+        Reviewed by Filip Pizlo.
+
+        * Scripts/run-jsc-benchmarks: Use Pathname so we get a "/" inserted when
+        we concatenate.
+
 2015-11-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Use CROSS_PLATFORM_CONTEXT_MENUS
index d7e412c..6c5bcb7 100755 (executable)
@@ -2819,22 +2819,22 @@ begin
   else
     config = {}
   end
-  OCTANE_PATH = config["OctanePath"]
-  BROWSERMARK_PATH = config["BrowserMarkPath"]
-  BROWSERMARK_JS_PATH = config["BrowserMarkJSPath"]
-  BROWSERMARK_DOM_PATH = config["BrowserMarkDOMPath"]
-  ASMBENCH_PATH = config["AsmBenchPath"]
-  COMPRESSIONBENCH_PATH = config["CompressionBenchPath"]
-  DSPJS_FILTRR_PATH = config["DSPJSFiltrrPath"]
-  DSPJS_ROUTE9_PATH = config["DSPJSRoute9Path"]
-  DSPJS_STARFIELD_PATH = config["DSPJSStarfieldPath"]
-  DSPJS_QUAKE3_PATH = config["DSPJSQuake3Path"]
-  DSPJS_MANDELBROT_PATH = config["DSPJSMandelbrotPath"]
-  DSPJS_JSLINUX_PATH = config["DSPJSLinuxPath"]
-  DSPJS_AMMOJS_ASMJS_PATH = config["DSPJSAmmoJSAsmJSPath"]
-  DSPJS_AMMOJS_REGULAR_PATH = config["DSPJSAmmoJSRegularPath"]
-  JSBENCH_PATH = config["JSBenchPath"]
-  KRAKEN_PATH = config["KrakenPath"]
+  OCTANE_PATH = Pathname.new(config["OctanePath"])
+  BROWSERMARK_PATH = Pathname.new(config["BrowserMarkPath"])
+  BROWSERMARK_JS_PATH = Pathname.new(config["BrowserMarkJSPath"])
+  BROWSERMARK_DOM_PATH = Pathname.new(config["BrowserMarkDOMPath"])
+  ASMBENCH_PATH = Pathname.new(config["AsmBenchPath"])
+  COMPRESSIONBENCH_PATH = Pathname.new(config["CompressionBenchPath"])
+  DSPJS_FILTRR_PATH = Pathname.new(config["DSPJSFiltrrPath"])
+  DSPJS_ROUTE9_PATH = Pathname.new(config["DSPJSRoute9Path"])
+  DSPJS_STARFIELD_PATH = Pathname.new(config["DSPJSStarfieldPath"])
+  DSPJS_QUAKE3_PATH = Pathname.new(config["DSPJSQuake3Path"])
+  DSPJS_MANDELBROT_PATH = Pathname.new(config["DSPJSMandelbrotPath"])
+  DSPJS_JSLINUX_PATH = Pathname.new(config["DSPJSLinuxPath"])
+  DSPJS_AMMOJS_ASMJS_PATH = Pathname.new(config["DSPJSAmmoJSAsmJSPath"])
+  DSPJS_AMMOJS_REGULAR_PATH = Pathname.new(config["DSPJSAmmoJSRegularPath"])
+  JSBENCH_PATH = Pathname.new(config["JSBenchPath"])
+  KRAKEN_PATH = Pathname.new(config["KrakenPath"])
   
   # If the --dont-copy-vms option was passed, it overrides the --force-vm-copy option.
   if $dontCopyVMs