Replace use of "diff -q".
authorNoah Misch
Thu, 9 Jul 2015 00:44:21 +0000 (20:44 -0400)
committerNoah Misch
Thu, 9 Jul 2015 00:44:26 +0000 (20:44 -0400)
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

index 481e0462dfd1d0b304e81749c638a74227a035b0..2dc737a2ec9a60181972c5c242b95b93f2285bac 100644 (file)
@@ -217,10 +217,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