JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Adding options and usage to run-nrtest.sh

Browse Source
This commit is contained in:
Michael Tryby
2019-02-11 15:43:53 -05:00
parent 60f1e5eda8
commit 799874d3c8
1 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tools/run-nrtest.sh
View File

@@ -18,14 +18,14 @@ run-nrtest()
return_value=0 return_value=0
test_suite_path=$1 test_suite_path=$2
benchmark_ver="220dev1" benchmark_ver="220dev1"
nrtest_execute_cmd="nrtest execute" nrtest_execute_cmd="nrtest execute"
test_app_path="apps/epanet-$2.json" test_app_path="apps/epanet-$3.json"
tests="tests/examples tests/exeter tests/large tests/network_one tests/small tests/tanks tests/valves" tests="tests/examples" # tests/exeter tests/large tests/network_one tests/small tests/tanks tests/valves"
test_output_path="benchmark/epanet-$2" test_output_path="benchmark/epanet-$3"
nrtest_compare_cmd="nrtest compare" nrtest_compare_cmd="nrtest compare"
ref_output_path="benchmark/epanet-${benchmark_ver}" ref_output_path="benchmark/epanet-${benchmark_ver}"
@@ -42,19 +42,46 @@ rm -rf ${test_output_path}
echo INFO: Creating test benchmark echo INFO: Creating test benchmark
nrtest_command="${nrtest_execute_cmd} ${test_app_path} ${tests} -o ${test_output_path}" nrtest_command="${nrtest_execute_cmd} ${test_app_path} ${tests} -o ${test_output_path}"
echo INFO: "$nrtest_command" echo INFO: "$nrtest_command"
if ! [ $( $nrtest_command ) ]; then return_value=$( $nrtest_command )
if [ $1 = 'true' ]; then
echo echo
echo INFO: Comparing test and ref benchmarks echo INFO: Comparing test and ref benchmarks
nrtest_command="${nrtest_compare_cmd} ${test_output_path} ${ref_output_path} --rtol ${rtol_value} --atol ${atol_value}" nrtest_command="${nrtest_compare_cmd} ${test_output_path} ${ref_output_path} --rtol ${rtol_value} --atol ${atol_value}"
echo INFO: "$nrtest_command" echo INFO: "$nrtest_command"
return_value=$( $nrtest_command ) return_value=$( $nrtest_command )
else
echo ERROR: Test benchmark creation failed
exit 1
fi fi
return $return_value return $return_value
} }
run-nrtest $1 $2 print_usage() {
echo " "
echo "run-nrtest.sh - generates artifacts for SUT and performes benchmark comparison "
echo " "
echo "options:"
echo "-c, don't compare SUT and benchmark artifacts"
echo "-t test_path relative path to location where test suite is staged"
echo "-v version version/build identifier"
}
# Default option values
compare='true'
test_path='nrtestsuite'
version='vXXX'
while getopts ":ct:v:" flag; do
case "${flag}" in
c ) compare='false' ;;
t ) test_path="${OPTARG}" ;;
v ) version=${OPTARG} ;;
\? ) print_usage
exit 1 ;;
esac
done
shift $(($OPTIND - 1))
# Invoke command
run_command="run-nrtest ${compare} ${test_path} ${version}"
echo INFO: "$run_command"
$run_command