From a7fd029cbe2c64991a57f0e2dd33697db28e43ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Skille?= Date: Fri, 10 May 2019 15:25:14 +0200 Subject: [PATCH 1/2] run compareECL once, checking all files in one go --- tests/run-regressionTest.sh | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/tests/run-regressionTest.sh b/tests/run-regressionTest.sh index 795f7f1ac..c734ce173 100755 --- a/tests/run-regressionTest.sh +++ b/tests/run-regressionTest.sh @@ -20,35 +20,14 @@ ${BINPATH}/${EXE_NAME} ${TEST_ARGS} --output-dir=${RESULT_PATH} test $? -eq 0 || exit 1 cd .. + ecode=0 -echo "=== Executing comparison for summary file ===" -${COMPARE_ECL_COMMAND} -t SMRY ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL} +echo "=== Executing comparison for EGRID, INIT, UNRST and RFT files if these exists in refrece folder ===" +${COMPARE_ECL_COMMAND} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${RESULT_PATH}/${FILENAME} ${ABS_TOL} ${REL_TOL} if [ $? -ne 0 ] then ecode=1 - ${COMPARE_ECL_COMMAND} -a -t SMRY ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL} -fi - -ignore_extra_kw="" -if grep -q "ignore_extra" <<< $ghprbCommentBody -then - ignore_extra_kw="-x" -fi - -echo "=== Executing comparison for restart file ===" -${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL} -if [ $? -ne 0 ] -then - ecode=1 - ${COMPARE_ECL_COMMAND} ${ignore_extra_kw} -a ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL} -fi - -echo "=== Executing comparison for init file ===" -${COMPARE_ECL_COMMAND} ${ignore_extra_kw} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL} -if [ $? -ne 0 ] -then - ecode=1 - ${COMPARE_ECL_COMMAND} ${ignore_extra_kw} -a -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${ABS_TOL} ${REL_TOL} + ${COMPARE_ECL_COMMAND} -a ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${RESULT_PATH}/${FILENAME} ${ABS_TOL} ${REL_TOL} fi exit $ecode From 0d916193b24f226c921856fa20fbbead9417828d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Skille?= Date: Mon, 3 Jun 2019 11:17:32 +0200 Subject: [PATCH 2/2] updated run-regressionTest.sh, added support for ignore_extra --- tests/run-regressionTest.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/run-regressionTest.sh b/tests/run-regressionTest.sh index c734ce173..dc96a6657 100755 --- a/tests/run-regressionTest.sh +++ b/tests/run-regressionTest.sh @@ -22,12 +22,19 @@ cd .. ecode=0 + +ignore_extra_kw="" +if grep -q "ignore_extra" <<< $ghprbCommentBody +then + ignore_extra_kw="-x" +fi + echo "=== Executing comparison for EGRID, INIT, UNRST and RFT files if these exists in refrece folder ===" -${COMPARE_ECL_COMMAND} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${RESULT_PATH}/${FILENAME} ${ABS_TOL} ${REL_TOL} +${COMPARE_ECL_COMMAND} ${ignore_extra_kw} ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${RESULT_PATH}/${FILENAME} ${ABS_TOL} ${REL_TOL} if [ $? -ne 0 ] then ecode=1 - ${COMPARE_ECL_COMMAND} -a ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${RESULT_PATH}/${FILENAME} ${ABS_TOL} ${REL_TOL} + ${COMPARE_ECL_COMMAND} ${ignore_extra_kw} -a ${INPUT_DATA_PATH}/opm-simulation-reference/${EXE_NAME}/${FILENAME} ${RESULT_PATH}/${FILENAME} ${ABS_TOL} ${REL_TOL} fi exit $ecode