From 6a630f9648546341cc410fa84572f1711028502b Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 28 Nov 2019 09:54:27 +0100 Subject: [PATCH 1/2] add test case for rockcomp --- compareECLFiles.cmake | 7 +++++++ tests/update_reference_data.sh | 1 + 2 files changed, 8 insertions(+) diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake index a66c4c59b..d0703bc8f 100755 --- a/compareECLFiles.cmake +++ b/compareECLFiles.cmake @@ -189,6 +189,13 @@ add_test_compareECLFiles(CASENAME spe1_thermal REL_TOL ${rel_tol} DIR spe1) +add_test_compareECLFiles(CASENAME spe1_rockcomp + FILENAME SPE1CASE2_ROCK2DTR + SIMULATOR flow + ABS_TOL ${abs_tol} + REL_TOL ${rel_tol} + DIR spe1) + add_test_compareECLFiles(CASENAME spe1_metric_vfp1 FILENAME SPE1CASE1_METRIC_VFP1 SIMULATOR flow diff --git a/tests/update_reference_data.sh b/tests/update_reference_data.sh index 711b790b3..e397c8384 100755 --- a/tests/update_reference_data.sh +++ b/tests/update_reference_data.sh @@ -58,6 +58,7 @@ tests[spe12p]="flow spe1 SPE1CASE2_2P spe1_2p" tests[spe1oilgas]="flow spe1 SPE1CASE2_OILGAS spe1_oilgas" tests[spe1nowells]="flow spe1 SPE1CASE2_NOWELLS spe1_nowells" tests[spe1thermal]="flow spe1 SPE1CASE2_THERMAL spe1_thermal" +tests[spe1rockcomp]="flow spe1 SPE1CASE2_ROCK2DTR spe1_rockcomp" tests[ctaquifer_2d_oilwater]="flow aquifer-oilwater 2D_OW_CTAQUIFER ctaquifer_2d_oilwater" tests[fetkovich_2d]="flow aquifer-fetkovich 2D_FETKOVICHAQUIFER fetkovich_2d" tests[msw_2d_h]="flow msw_2d_h 2D_H__" From 414f64f46d0634da2550d0c1c4c30e1c295ff78d Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 28 Nov 2019 10:20:40 +0100 Subject: [PATCH 2/2] changed: only update reference data for tests marked as failures --- tests/update_reference_data.sh | 35 ++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/tests/update_reference_data.sh b/tests/update_reference_data.sh index e397c8384..6a96da64f 100755 --- a/tests/update_reference_data.sh +++ b/tests/update_reference_data.sh @@ -90,19 +90,30 @@ tests[udq]="flow udq_actionx UDQ_WCONPROD udq_wconprod" tests[spe1_foam]="flow spe1_foam SPE1FOAM" changed_tests="" -for test_name in ${!tests[*]} + +# Read failed tests +FAILED_TESTS=`cat $WORKSPACE/$configuration/build-opm-simulators/Testing/Temporary/LastTestsFailed*.log` + +for failed_test in $FAILED_TESTS do - binary=`echo ${tests[$test_name]} | awk -F ' ' '{print $1}'` - dirname=`echo ${tests[$test_name]} | awk -F ' ' '{print $2}'` - casename=`echo ${tests[$test_name]} | awk -F ' ' '{print $3}'` - tname=`echo ${tests[$test_name]} | awk -F ' ' '{print $4}'` - test -z "$tname" && tname=$dirname - copyToReferenceDir \ - $configuration/build-opm-simulators/tests/results/$binary+$tname/ \ - $OPM_TESTS_ROOT/$dirname/opm-simulation-reference/$binary \ - $casename \ - EGRID INIT RFT SMSPEC UNRST UNSMRY - test $? -eq 0 && changed_tests="$changed_tests $test_name" + failed=`echo $failed_test | sed -e 's/.*:compareECLFiles_//g'` + for test_name in ${!tests[*]} + do + binary=`echo ${tests[$test_name]} | awk -F ' ' '{print $1}'` + dirname=`echo ${tests[$test_name]} | awk -F ' ' '{print $2}'` + casename=`echo ${tests[$test_name]} | awk -F ' ' '{print $3}'` + tname=`echo ${tests[$test_name]} | awk -F ' ' '{print $4}'` + test -z "$tname" && tname=$dirname + if grep -q "$failed" <<< "$binary+$casename" + then + copyToReferenceDir \ + $configuration/build-opm-simulators/tests/results/$binary+$tname/ \ + $OPM_TESTS_ROOT/$dirname/opm-simulation-reference/$binary \ + $casename \ + EGRID INIT RFT SMSPEC UNRST UNSMRY + test $? -eq 0 && changed_tests="$changed_tests $test_name" + fi + done done # special tests