From be534d3e5152690bebe27537b64a18fcb5f5bdcc Mon Sep 17 00:00:00 2001 From: Jared Wasinger Date: Mon, 30 Mar 2020 22:12:33 +0000 Subject: [PATCH] fix parity Dockerfile, fix benchmark output merging script --- evm/parity/Dockerfile | 1 + evm/scripts/merge.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/evm/parity/Dockerfile b/evm/parity/Dockerfile index def28d3..87e9605 100644 --- a/evm/parity/Dockerfile +++ b/evm/parity/Dockerfile @@ -34,6 +34,7 @@ RUN rustup target add wasm32-unknown-unknown # install parity-evm RUN git clone --recursive --single-branch --branch evm-code-bencher https://github.com/cdetrio/parity RUN cd parity/evmbin && cargo build --release +RUN mv parity / # deps required to build full parity for native precompile benchmarks RUN apt-get update diff --git a/evm/scripts/merge.py b/evm/scripts/merge.py index c333d28..567369a 100644 --- a/evm/scripts/merge.py +++ b/evm/scripts/merge.py @@ -1,10 +1,11 @@ #!/usr/bin/python3 import csv +import os RESULT_CSV_OUTPUT_PATH = "/evmraceresults/" EVMS = ["evmone", "parity", "geth", "cita-vm"] -RESULT_FILE = "evm_benchmarks.csv" +RESULT_FILE = os.path.join(RESULT_CSV_OUTPUT_PATH + "evm_benchmarks.csv") def main(): fieldnames = ['engine', 'test_name', 'total_time', 'gas_used']