diff --git a/tests/run-parallel-regressionTest.sh b/tests/run-parallel-regressionTest.sh index 445f1258f..7d7a7209e 100755 --- a/tests/run-parallel-regressionTest.sh +++ b/tests/run-parallel-regressionTest.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e INPUT_DATA_PATH="$1" RESULT_PATH="$2" @@ -17,10 +16,20 @@ rm -Rf ${RESULT_PATH} mkdir -p ${RESULT_PATH} cd ${RESULT_PATH} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA linear_solver_reduction=1e-7 tolerance_cnv=5e-6 tolerance_mb=1e-8 +test $? -eq 0 || exit 1 mkdir mpi cd mpi mpirun -np 4 ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA linear_solver_reduction=1e-7 tolerance_cnv=5e-6 tolerance_mb=1e-8 +test $? -eq 0 || exit 1 cd .. +ecode=0 ${COMPARE_SUMMARY_COMMAND} -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL} +if [ $? -ne 0 ] +then + ecode=1 +fi ${COMPARE_ECL_COMMAND} -l ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/mpi/${FILENAME} ${ABS_TOL} ${REL_TOL} +test $? -eq 0 || ecode=1 + +exit $ecode diff --git a/tests/run-regressionTest.sh b/tests/run-regressionTest.sh index d2705eca6..ce00f6e75 100755 --- a/tests/run-regressionTest.sh +++ b/tests/run-regressionTest.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e INPUT_DATA_PATH="$1" RESULT_PATH="$2" @@ -19,8 +18,17 @@ cd ${RESULT_PATH} ${BINPATH}/${EXE_NAME} ${TEST_ARGS} cd .. +ecode=0 ${COMPARE_SUMMARY_COMMAND} -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} +if [ $? -ne 0 ] +then + ecode=1 +fi ${COMPARE_ECL_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} +test $? -eq 0 || ecode=1 ${COMPARE_ECL_COMMAND} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} +test $? -eq 0 || ecode=1 + +exit $ecode diff --git a/tests/run-restart-regressionTest.sh b/tests/run-restart-regressionTest.sh index 67f7b09ef..3fcd5cf38 100755 --- a/tests/run-restart-regressionTest.sh +++ b/tests/run-restart-regressionTest.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e INPUT_DATA_PATH="$1" RESULT_PATH="$2" @@ -17,8 +16,18 @@ rm -Rf ${RESULT_PATH} mkdir -p ${RESULT_PATH} cd ${RESULT_PATH} ${BINPATH}/${EXE_NAME} ${TEST_ARGS}.DATA timestep.adaptive=false +test $? -eq 0 || exit 1 ${BINPATH}/${EXE_NAME} ${TEST_ARGS}_RESTART.DATA timestep.adaptive=false +test $? -eq 0 || exit 1 +ecode=0 ${COMPARE_SUMMARY_COMMAND} -R ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL} +if [ $? -ne 0 ] +then + ecode=1 +fi ${COMPARE_ECL_COMMAND} -l ${RESULT_PATH}/${FILENAME} ${RESULT_PATH}/${FILENAME}_RESTART ${ABS_TOL} ${REL_TOL} +test $? -eq 0 || ecode=1 + +exit $ecode