Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit e622303

Browse files
committed
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 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_50@309003 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent d175f9a commit e622303

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

utils/release/test-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ for Flavor in $Flavors ; do
562562
# case there are build paths in the debug info. On some systems,
563563
# sed adds a newline to the output, so pass $p3 through sed too.
564564
if ! cmp -s \
565-
<(env LC_CTYPE=C sed -e 's,Phase2,Phase3,g' $p2) \
565+
<(env LC_CTYPE=C sed -e 's,Phase2,Phase3,g' -e 's,Phase1,Phase2,g' $p2) \
566566
<(env LC_CTYPE=C sed -e '' $p3) 16 16; then
567567
echo "file `basename $p2` differs between phase 2 and phase 3"
568568
fi

0 commit comments

Comments
 (0)