[llvm-branch-commits] [llvm-branch] r309003 - Merging r308912:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Tue Jul 25 12:01:47 2017
New Revision: 309003

URL: http://llvm.org/viewvc/llvm-project?rev=309003&view=rev
Log:
Merging r308912:

------------------------------------------------------------------------
r308912 | tstellar | 2017-07-24 15:28:30 -0400 (Mon, 24 Jul 2017) | 14 lines

test-release.sh: Fix phase2 and phase3 binary comparision

Summary:
scudo_utils.cpp.o from compiler-rt has one of the host compiler's builtin
include paths stored in the .debug_line section.  So we need to do
sed 's,Phase1,Phase2,g` on the Phase2 object file so it matches Phase3.

Reviewers: hans

Reviewed By: hans

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D34989
------------------------------------------------------------------------

Modified:
    llvm/branches/release_50/utils/release/test-release.sh

Modified: llvm/branches/release_50/utils/release/test-release.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_50/utils/release/test-release.sh?rev=309003&r1=309002&r2=309003&view=diff
==============================================================================
--- llvm/branches/release_50/utils/release/test-release.sh (original)
+++ llvm/branches/release_50/utils/release/test-release.sh Tue Jul 25 12:01:47 2017
@@ -562,7 +562,7 @@ for Flavor in $Flavors ; do
             # 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 -s \
-                <(env LC_CTYPE=C sed -e 's,Phase2,Phase3,g' $p2) \
+                <(env LC_CTYPE=C sed -e 's,Phase2,Phase3,g' -e 's,Phase1,Phase2,g' $p2) \
                 <(env LC_CTYPE=C sed -e '' $p3) 16 16; then
                 echo "file `basename $p2` differs between phase 2 and phase 3"
             fi