summaryrefslogtreecommitdiffstats
path: root/llvm/utils/release
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2019-08-05 13:04:12 +0000
committerHans Wennborg <hans@hanshq.net>2019-08-05 13:04:12 +0000
commit5a4b41f14609c6f9fea47d77e63f937ec8b1376d (patch)
treec551ed09e5600cfc4f3c8375a753ac4499856d3b /llvm/utils/release
parentf75dae9f5c06416ac1729bbe59de8423bb44c622 (diff)
downloadbcm5719-llvm-5a4b41f14609c6f9fea47d77e63f937ec8b1376d.tar.gz
bcm5719-llvm-5a4b41f14609c6f9fea47d77e63f937ec8b1376d.zip
test-release.sh: Perform the sed substitution on both files (PR42739)
The comparison would otherwise fail if Phase2 occurrs naturally in the object file. It would get replaced with Phase3 in the one .o, but not in the other. We were already running both files through sed to have them processed in this same way; this is a logical extension of that. llvm-svn: 367847
Diffstat (limited to 'llvm/utils/release')
-rwxr-xr-xllvm/utils/release/test-release.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/utils/release/test-release.sh b/llvm/utils/release/test-release.sh
index 558e01d2eab..031687f6e4b 100755
--- a/llvm/utils/release/test-release.sh
+++ b/llvm/utils/release/test-release.sh
@@ -591,11 +591,12 @@ for Flavor in $Flavors ; do
for p2 in `find $llvmCore_phase2_objdir -name '*.o'` ; do
p3=`echo $p2 | sed -e 's,Phase2,Phase3,'`
# 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.
+ # case there are build paths in the debug info. Do the same sub-
+ # stitution on both files in case the string occurrs naturally.
if ! cmp -s \
<(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
+ <(env LC_CTYPE=C sed -e 's,Phase2,Phase3,g' -e 's,Phase1,Phase2,g' $p3) \
+ 16 16; then
echo "file `basename $p2` differs between phase 2 and phase 3"
fi
done
OpenPOWER on IntegriCloud