postgres.git / summary / log / commit / refs

commit    f7b3300384c1f726e4c1fe34ecec409826c2cdef
Author:   Noah Misch <noah@leadboat.com>
Date:     Thu Jul 09 00:44:21 2015 +0000
First released in: 9.6.0, 9.2.14, 9.3.10, 9.4.5, 9.5.0

    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.


 contrib/pg_upgrade/test.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index 905729028fa..f52e3f5ae6d 100644
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/pg_upgrade/test.sh
@@ -193,10 +193,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


[parent: 458ccbf2b3a9]