From: Noah Misch <noah@leadboat.com>
Date: Thu, 9 Jul 2015 00:44:21 +0000 (-0400)
Subject: Replace use of "diff -q".
X-Git-Tag: REL9_5_ALPHA2~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ed6e70ace8e8d2f0747c16a796a21147ffaf404;p=postgresql

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.
---

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