[llvm-branch-commits] [llvm-branch] r368005 - Merging r368004:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug  6 02:30:53 2019
New Revision: 368005

URL: http://llvm.org/viewvc/llvm-project?rev=368005&view=rev
Log:
Merging r368004:
------------------------------------------------------------------------
r368004 | hans | 2019-08-06 11:30:10 +0200 (Tue, 06 Aug 2019) | 1 line

test-release.sh: Reorder sed commands for the binary comparison
------------------------------------------------------------------------

Modified:
    llvm/branches/release_90/   (props changed)
    llvm/branches/release_90/utils/release/test-release.sh

Propchange: llvm/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  6 02:30:53 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,366431,366481,366487,366527,366570,366660,366868,366925,367030,367062,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367417,367662,367753,367846-367847,367941
+/llvm/trunk:155241,366431,366481,366487,366527,366570,366660,366868,366925,367030,367062,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367417,367662,367753,367846-367847,367941,368004

Modified: llvm/branches/release_90/utils/release/test-release.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/utils/release/test-release.sh?rev=368005&r1=368004&r2=368005&view=diff
==============================================================================
--- llvm/branches/release_90/utils/release/test-release.sh (original)
+++ llvm/branches/release_90/utils/release/test-release.sh Tue Aug  6 02:30:53 2019
@@ -594,8 +594,8 @@ for Flavor in $Flavors ; do
             # 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 's,Phase2,Phase3,g' -e 's,Phase1,Phase2,g' $p3) \
+                <(env LC_CTYPE=C sed -e 's,Phase1,Phase2,g' -e 's,Phase2,Phase3,g' $p2) \
+                <(env LC_CTYPE=C sed -e 's,Phase1,Phase2,g' -e 's,Phase2,Phase3,g' $p3) \
                 16 16; then
                 echo "file `basename $p2` differs between phase 2 and phase 3"
             fi