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

Commit 371e006

Browse files
committed
Merging r242341:
------------------------------------------------------------------------ r242341 | hans | 2015-07-15 15:18:25 -0700 (Wed, 15 Jul 2015) | 7 lines test-release.sh: Run both .o files through sed before comparing them On some systems (e.g. Mac OS X), sed will add a newline to the end of the output if there wasn't one already. This would cause false cmp errors since the .o file from Phase 2 was passed through sed and the one from Phase 3 wasn't. Work around this by passing both through sed. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_37@242361 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 789b63a commit 371e006

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

utils/release/test-release.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,10 @@ for Flavor in $Flavors ; do
464464
for p2 in `find $llvmCore_phase2_objdir -name '*.o'` ; do
465465
p3=`echo $p2 | sed -e 's,Phase2,Phase3,'`
466466
# Substitute 'Phase2' for 'Phase3' in the Phase 2 object file in
467-
# case there are build paths in the debug info.
468-
if ! cmp --ignore-initial=16 <(sed -e 's,Phase2,Phase3,g' $p2) $p3 \
469-
> /dev/null 2>&1 ; then
467+
# case there are build paths in the debug info. On some systems,
468+
# sed adds a newline to the output, so pass $p3 through sed too.
469+
if ! cmp --ignore-initial=16 <(sed -e 's,Phase2,Phase3,g' $p2) \
470+
<(sed -e '' $p3) > /dev/null 2>&1 ; then
470471
echo "file `basename $p2` differs between phase 2 and phase 3"
471472
fi
472473
done

0 commit comments

Comments
 (0)