OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3693 from akva2/fix_changed_tests

Browse Source 
fixed: only update files if they actually changed
This commit is contained in:
Joakim Hove 2021-11-14 13:11:12 +01:00 committed by GitHub
commit b28c3abbc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/update_reference_data.sh
View File

@ -30,7 +30,8 @@ copyToReferenceDir () {
continue continue
fi fi
diff -q "$SRC_DIR/$STEM.$filetype" "$DST_DIR/$STEM.$filetype" diff -q "$SRC_DIR/$STEM.$filetype" "$DST_DIR/$STEM.$filetype"
if test $? -ne 0 && test -n "$CONVERT_ECL" res=$?
if test $res -ne 0 && test -n "$CONVERT_ECL"
then then
cp $SRC_DIR/$STEM.$filetype $TMPDIR/new cp $SRC_DIR/$STEM.$filetype $TMPDIR/new
$CONVERT_ECL $TMPDIR/new/$STEM.$filetype $CONVERT_ECL $TMPDIR/new/$STEM.$filetype
@ -38,8 +39,11 @@ copyToReferenceDir () {
$CONVERT_ECL $TMPDIR/orig/$STEM.$filetype $CONVERT_ECL $TMPDIR/orig/$STEM.$filetype
diff -u $TMPDIR/orig/$STEM.F$filetype $TMPDIR/new/$STEM.F$filetype >> $WORKSPACE/data_diff diff -u $TMPDIR/orig/$STEM.F$filetype $TMPDIR/new/$STEM.F$filetype >> $WORKSPACE/data_diff
fi fi
if test $res -ne 0
then
cp "$SRC_DIR/$STEM.$filetype" $DST_DIR cp "$SRC_DIR/$STEM.$filetype" $DST_DIR
DIFF=0 DIFF=0
fi
done done
return $DIFF return $DIFF
@ -242,7 +246,7 @@ done
cd $OPM_TESTS_ROOT cd $OPM_TESTS_ROOT
if [ -n "$BRANCH_NAME" ] if [ -n "$BRANCH_NAME" ]
then then
git checkout -b $BRANCH_NAME origin/master git checkout -b $BRANCH_NAME $BRANCH_BASE
fi fi
# Add potential new files # Add potential new files