Merging r242721:

------------------------------------------------------------------------
r242721 | dim | 2015-07-20 15:07:27 -0700 (Mon, 20 Jul 2015) | 4 lines

Since BSD cmp(1) does not support the --ignore-initial option, use the
more portable 3rd and 4th arguments to skip the first 16 bytes during
the comparison of Phase2 and Phase3 objects.

------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_37@242860 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh
index b34a61f0fe6467888efba220a780f99f08746205..96489261bbde75188cc0c311c6c051206491a3d0 100755 (executable)
--- a/utils/release/test-release.sh
+++ b/utils/release/test-release.sh
@@ -470,8 +470,8 @@ for Flavor in $Flavors ; do
             # Substitute 'Phase2' for 'Phase3' in the Phase 2 object file in
             # case there are build paths in the debug info. On some systems,
             # sed adds a newline to the output, so pass $p3 through sed too.
-            if ! cmp --ignore-initial=16 <(sed -e 's,Phase2,Phase3,g' $p2) \
-                    <(sed -e '' $p3) > /dev/null 2>&1 ; then
+            if ! cmp -s <(sed -e 's,Phase2,Phase3,g' $p2) <(sed -e '' $p3) \
+                    16 16 ; then
                 echo "file `basename $p2` differs between phase 2 and phase 3"
             fi
         done