fix parity Dockerfile, fix benchmark output merging script

ewasm · Mar 30, 2020 · be534d3 · be534d3
1 parent 3e3a10b
commit be534d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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']