From 483c13d25e74539791595ee5e1229051f1a949c3 Mon Sep 17 00:00:00 2001 From: Markus Wittmann Date: Mon, 10 Jul 2017 12:03:37 +0200 Subject: [PATCH] fix test.sh test.sh depended on the module infrastructure of RRZE. To run tests now a valid config must be specified. --- src/test.sh | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/src/test.sh b/src/test.sh index ea64791..7a76f51 100755 --- a/src/test.sh +++ b/src/test.sh @@ -32,12 +32,25 @@ XTag="-test" Build=release - - -Config=linux-intel - -module purge -module add intel64 +if [ "$#" -lt 1 ]; then + echo "Compiles and runs several test cases." + echo "" + echo "Usage: test.sh " + echo "" + echo "Select a configuration via config: linux-gcc or linux-intel." + exit 1 +fi + +if [ "$1" == "-h" -o "$1" == "-help" -o "$1" == "--help" ]; then + echo "Compiles and runs several test cases." + echo "" + echo "Usage: test.sh " + echo "" + echo "Select a configuration via config: linux-gcc or linux-intel." + exit 1 +fi + +Config="$1" make clean-all make -j CONFIG=$Config TAG=$XTag-debug @@ -48,22 +61,3 @@ BinaryV="../bin/lbmbenchk-$Config-$Build$XTag-v" BinaryB="../bin/lbmbenchk-$Config-$Build$XTag-b" ./test-verification.sh "$BinaryV" - - - -Config=linux-gcc - -module purge -module add gcc - -make clean-all - -make -j CONFIG=$Config TAG=$XTag-debug -make -j CONFIG=$Config BUILD=$Build TAG=$XTag-v -make -j CONFIG=$Config BUILD=$Build TAG=$XTag-b BENCHMARK=on - -BinaryV="../bin/lbmbenchk-$Config-$Build$XTag-v" -BinaryB="../bin/lbmbenchk-$Config-$Build$XTag-b" - -./test-verification.sh "$BinaryV" - -- 2.25.1