From 42ef0655ee3c27e09871bbcfc32e56424d34d616 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 10 Mar 2017 14:44:48 +0100 Subject: [PATCH] changed: print some banners during test comparisons to make output more readable --- tests/run-parallel-regressionTest.sh | 3 +++ tests/run-regressionTest.sh | 3 +++ tests/run-restart-regressionTest.sh | 2 ++ 3 files changed, 8 insertions(+) diff --git a/tests/run-parallel-regressionTest.sh b/tests/run-parallel-regressionTest.sh index acbe80402..1c149b6ca 100755 --- a/tests/run-parallel-regressionTest.sh +++ b/tests/run-parallel-regressionTest.sh @@ -28,12 +28,15 @@ test $? -eq 0 || exit 1 cd .. ecode=0 +echo "=== Executing comparison for summary file ===" ${COMPARE_SUMMARY_COMMAND} -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL} if [ $? -ne 0 ] then ecode=1 `dirname $0`/analyze_summary_failure.sh ${COMPARE_SUMMARY_COMMAND} -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL} fi + +echo "=== Executing comparison for restart file ===" ${COMPARE_ECL_COMMAND} -l ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL} if [ $? -ne 0 ] then diff --git a/tests/run-regressionTest.sh b/tests/run-regressionTest.sh index 96d05a5db..f6a808f6b 100755 --- a/tests/run-regressionTest.sh +++ b/tests/run-regressionTest.sh @@ -22,6 +22,7 @@ ${BINPATH}/${EXE_NAME} ${TEST_ARGS} cd .. ecode=0 +echo "=== Executing comparison for summary file ===" ${COMPARE_SUMMARY_COMMAND} -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} if [ $? -ne 0 ] then @@ -29,6 +30,7 @@ then `dirname $0`/analyze_summary_failure.sh ${COMPARE_SUMMARY_COMMAND} -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} fi +echo "=== Executing comparison for restart file ===" ${COMPARE_ECL_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} if [ $? -ne 0 ] then @@ -36,6 +38,7 @@ then `dirname $0`/analyze_ecl_failure.sh ${COMPARE_ECL_COMMAND} UNRST ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} fi +echo "=== Executing comparison for init file ===" ${COMPARE_ECL_COMMAND} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} if [ $? -ne 0 ] then diff --git a/tests/run-restart-regressionTest.sh b/tests/run-restart-regressionTest.sh index 8fbd5043b..f5e9bb28a 100755 --- a/tests/run-restart-regressionTest.sh +++ b/tests/run-restart-regressionTest.sh @@ -25,6 +25,7 @@ ${BINPATH}/${EXE_NAME} ${TEST_ARGS}_RESTART.DATA timestep.adaptive=false test $? -eq 0 || exit 1 ecode=0 +echo "=== Executing comparison for summary file ===" ${COMPARE_SUMMARY_COMMAND} -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL} if [ $? -ne 0 ] then @@ -32,6 +33,7 @@ then `dirname $0`/analyze_summary_failure.sh ${COMPARE_SUMMARY_COMMAND} -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL} fi +echo "=== Executing comparison for restart file ===" ${COMPARE_ECL_COMMAND} -l ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL} if [ $? -ne 0 ] then