external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make diff normalize our test output files in place

pull/3336/head
Jelte Fennema 2019-12-23 14:36:21 +01:00
parent 3cfb9b64bf
commit b815425d2c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/regress/bin/diff
View File

@ -9,6 +9,7 @@
# #
# Note that src/test/regress/Makefile adds this directory to $PATH so # Note that src/test/regress/Makefile adds this directory to $PATH so
# pg_regress uses this diff tool instead of the system diff tool. # pg_regress uses this diff tool instead of the system diff tool.
set -eu -o pipefail
file1="${@:(-2):1}" file1="${@:(-2):1}"
file2="${@:(-1):1}" file2="${@:(-1):1}"
@ -29,13 +30,14 @@ then
DIFF=/usr/bin/diff DIFF=/usr/bin/diff
fi fi
if test -z "$VANILLATEST" if test -z "${VANILLATEST:-}"
then then
sed -Ef $BASEDIR/normalize.sed < $file1 > $file1.modified sed -Ef $BASEDIR/normalize.sed < $file1 > "$file1.modified"
sed -Ef $BASEDIR/normalize.sed < $file2 > $file2.modified mv "$file1.modified" "$file1"
$DIFF -w $args $file1.modified $file2.modified sed -Ef $BASEDIR/normalize.sed < "$file2" > "$file2.modified"
mv "$file2.modified" "$file2"
$DIFF -w $args $file1 $file2
exitcode=$? exitcode=$?
rm -f $file1.modified $file2.modified
exit $exitcode exit $exitcode
else else
exec $DIFF -w $args $file1 $file2 exec $DIFF -w $args $file1 $file2