Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Allow nil for unspecified benchmark pathes
https://bugs.webkit.org/show_bug.cgi?id=151784

Reviewed by Filip Pizlo.

`Pathname.new(nil)` will raise an error.
Only generate Pathname if the benchmark path is specified.

* Scripts/run-jsc-benchmarks:


Canonical link: https://commits.webkit.org/169927@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192990 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Constellation committed Dec 3, 2015
1 parent bfedaf6 commit b6c56ed
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 16 deletions.
12 changes: 12 additions & 0 deletions Tools/ChangeLog
@@ -1,3 +1,15 @@
2015-12-02 Yusuke Suzuki <utatane.tea@gmail.com>

Allow nil for unspecified benchmark pathes
https://bugs.webkit.org/show_bug.cgi?id=151784

Reviewed by Filip Pizlo.

`Pathname.new(nil)` will raise an error.
Only generate Pathname if the benchmark path is specified.

* Scripts/run-jsc-benchmarks:

2015-12-02 Brent Fulgham <bfulgham@apple.com>

[Win] Run non-http tests without Cygwin
Expand Down
41 changes: 25 additions & 16 deletions Tools/Scripts/run-jsc-benchmarks
Expand Up @@ -2819,22 +2819,31 @@ begin
else
config = {}
end
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"])

def pathname_if_exist config
if config
Pathname.new config
else
config
end
end

OCTANE_PATH = pathname_if_exist(config["OctanePath"])
BROWSERMARK_PATH = pathname_if_exist(config["BrowserMarkPath"])
BROWSERMARK_JS_PATH = pathname_if_exist(config["BrowserMarkJSPath"])
BROWSERMARK_DOM_PATH = pathname_if_exist(config["BrowserMarkDOMPath"])
ASMBENCH_PATH = pathname_if_exist(config["AsmBenchPath"])
COMPRESSIONBENCH_PATH = pathname_if_exist(config["CompressionBenchPath"])
DSPJS_FILTRR_PATH = pathname_if_exist(config["DSPJSFiltrrPath"])
DSPJS_ROUTE9_PATH = pathname_if_exist(config["DSPJSRoute9Path"])
DSPJS_STARFIELD_PATH = pathname_if_exist(config["DSPJSStarfieldPath"])
DSPJS_QUAKE3_PATH = pathname_if_exist(config["DSPJSQuake3Path"])
DSPJS_MANDELBROT_PATH = pathname_if_exist(config["DSPJSMandelbrotPath"])
DSPJS_JSLINUX_PATH = pathname_if_exist(config["DSPJSLinuxPath"])
DSPJS_AMMOJS_ASMJS_PATH = pathname_if_exist(config["DSPJSAmmoJSAsmJSPath"])
DSPJS_AMMOJS_REGULAR_PATH = pathname_if_exist(config["DSPJSAmmoJSRegularPath"])
JSBENCH_PATH = pathname_if_exist(config["JSBenchPath"])
KRAKEN_PATH = pathname_if_exist(config["KrakenPath"])

# If the --dont-copy-vms option was passed, it overrides the --force-vm-copy option.
if $dontCopyVMs
Expand Down

0 comments on commit b6c56ed

Please sign in to comment.