From e7d1da367150b03456b9e0f04b6ecd2ec13d51e0 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Sat, 14 Sep 2019 15:01:27 +0200 Subject: tools: clean up third_party.py, and merge prebuilt.py into it (#2950) * Remove reference to removed dir 'third_party/rust_crates'. * Remove reference to unused environment variable 'DENO_NINJA_PATH'. * Remove helper functions 'root()' and 'tp()'. * Move definition of 'third_party_path' to build.py. * Move definition of 'gn_exe()' to setup.py. * Move 'download_sccache()' and 'download_hyperfine()' from prebuilt.py to third_party.py, and delete prebuilt.py. * Add helper function 'get_platform_dir_name()' to locate the platform-specific 'v8/buildtools/' and 'prebuilt/' directories. * Add helper function 'get_prebuilt_tool_path()' that returns the full path to a platform-specific executable in //prebuilt. * Cosmetic improvements. --- tools/benchmark.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools/benchmark.py') diff --git a/tools/benchmark.py b/tools/benchmark.py index 3c9875d6a..cfb307b8e 100755 --- a/tools/benchmark.py +++ b/tools/benchmark.py @@ -15,7 +15,7 @@ import tempfile import subprocess from util import find_exts, root_path, run, run_output from util import build_path, executable_suffix -import prebuilt +import third_party from http_benchmark import http_benchmark import throughput_benchmark import http_server @@ -178,10 +178,11 @@ def run_max_mem_benchmark(deno_exe): def run_exec_time(deno_exe, build_dir): + third_party.download_hyperfine() + hyperfine_exe = third_party.get_prebuilt_tool_path("hyperfine") benchmark_file = os.path.join(build_dir, "hyperfine_results.json") - hyperfine = prebuilt.load_hyperfine() run([ - hyperfine, "--ignore-failure", "--export-json", benchmark_file, + hyperfine_exe, "--ignore-failure", "--export-json", benchmark_file, "--warmup", "3" ] + [ deno_exe + " run " + " ".join(args) -- cgit v1.2.3