From cfcba154a75506acacba9c014a510e6ff839b7bc Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Fri, 13 Apr 2018 15:52:52 -0400 Subject: [PATCH] Migrating Travis to 2012vs10 benchmark --- tools/before-test.sh | 4 ++-- tools/run-nrtest.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/before-test.sh b/tools/before-test.sh index 80b6794..8cb902b 100755 --- a/tools/before-test.sh +++ b/tools/before-test.sh @@ -22,8 +22,8 @@ SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" TEST_HOME=$1 -EXAMPLES_VER="1.0.0" -BENCHMARK_VER="2012" +EXAMPLES_VER="1.0.1" +BENCHMARK_VER="2012vs10" TEST_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/v${EXAMPLES_VER}.tar.gz" BENCH_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/download/v${EXAMPLES_VER}/epanet-benchmark-${BENCHMARK_VER}.tar.gz" diff --git a/tools/run-nrtest.sh b/tools/run-nrtest.sh index ddd750a..c561ad6 100755 --- a/tools/run-nrtest.sh +++ b/tools/run-nrtest.sh @@ -19,6 +19,8 @@ run-nrtest() return_value=0 test_suite_path=$1 +benchmark_ver="2012vs10" + nrtest_execute_cmd="nrtest execute" test_app_path="apps/epanet-$2.json" @@ -26,7 +28,7 @@ tests="tests/examples tests/exeter tests/large tests/network_one tests/small tes test_output_path="benchmark/epanet-$2" nrtest_compare_cmd="nrtest compare" -ref_output_path="benchmark/epanet-2012" +ref_output_path="benchmark/epanet-${benchmark_ver}" rtol_value=0.1 atol_value=0.0