summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch2015-07-09 00:44:21 +0000
committerNoah Misch2015-07-09 00:44:21 +0000
commitb28244abe58382be980d9b9577276c0700dd2cbc (patch)
tree314c23bb1f00a99b224396c9e32dac0ac96e6bbb
parente135c3d99f4fcb03efa7b0b64445853ee2a74857 (diff)
Replace use of "diff -q".
POSIX does not specify the -q option, and many implementations do not offer it. Don't bother changing the MSVC build system, because having non-GNU diff on Windows is vanishingly unlikely. Back-patch to 9.2, where this invocation was introduced.
-rw-r--r--src/bin/pg_upgrade/test.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 07002f6a16..f4e5d9ae6e 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -216,10 +216,11 @@ case $testhost in
*) sh ./delete_old_cluster.sh ;;
esac
-if diff -q "$temp_root"/dump1.sql "$temp_root"/dump2.sql; then
+if diff "$temp_root"/dump1.sql "$temp_root"/dump2.sql >/dev/null; then
echo PASSED
exit 0
else
+ echo "Files $temp_root/dump1.sql and $temp_root/dump2.sql differ"
echo "dumps were not identical"
exit 1
fi