Linux: Sort installer expectations in ASCII order. (try 2)

I forgot to sort the actual results in
https://crrev.com/e54ba1f2b08f887f1a0e8898d2dc0904bacb38c4

Review URL: https://codereview.chromium.org/1656183002

Cr-Commit-Position: refs/heads/master@{#372999}

4 files changed, 35 insertions, 33 deletions

diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh
index d0e7f2c..de11150 100755
--- a/chrome/installer/linux/debian/build.sh
+++ b/chrome/installer/linux/debian/build.sh
@@ -275,11 +275,11 @@ fi
 # Format it nicely and save it for comparison.
 # The grep -v is for a duplicate libc6 dep caused by Lucid glibc silliness.
 echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \
-  grep -v '^libc6 (>= 2.3.6-6~)$' > actual
+  grep -v '^libc6 (>= 2.3.6-6~)$' | LANG=C sort > actual
 
 # Compare the expected dependency list to the generate list.
 BAD_DIFF=0
-diff "$SCRIPTDIR/expected_deps_$TARGETARCH" actual || BAD_DIFF=1
+diff -u "$SCRIPTDIR/expected_deps_$TARGETARCH" actual || BAD_DIFF=1
 if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then
   echo
   echo "ERROR: Shared library dependencies changed!"
diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
index 48989bbf..dd4233c 100755
--- a/chrome/installer/linux/rpm/build.sh
+++ b/chrome/installer/linux/rpm/build.sh
@@ -113,8 +113,10 @@ do_package() {
   # link-time code rewriting, but it might leave the symbol dependency in
   # place -- there are no guarantees.
   BAD_DIFF=0
-  diff "$SCRIPTDIR/expected_deps_$ARCHITECTURE" \
-      <(echo "${DETECTED_DEPENDS}" | grep -v '^ld-linux.*\(GLIBC_2\.3\)') \
+  diff -u "$SCRIPTDIR/expected_deps_$ARCHITECTURE" \
+      <(echo "${DETECTED_DEPENDS}" | \
+        LANG=C sort | \
+        grep -v '^ld-linux.*\(GLIBC_2\.3\)') \
       || BAD_DIFF=1
   if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then
     echo
diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386
index 9e5be3c..87cdada 100644
--- a/chrome/installer/linux/rpm/expected_deps_i386
+++ b/chrome/installer/linux/rpm/expected_deps_i386
@@ -1,13 +1,23 @@
 ld-linux.so.2
 ld-linux.so.2(GLIBC_2.1)
+libX11.so.6
+libXcomposite.so.1
+libXcursor.so.1
+libXdamage.so.1
+libXext.so.6
+libXfixes.so.3
+libXi.so.6
+libXrandr.so.2
+libXrender.so.1
+libXss.so.1
+libXtst.so.6
 libasound.so.2
 libatk-1.0.so.0
-libcairo.so.2
 libc.so.6
 libc.so.6(GLIBC_2.0)
 libc.so.6(GLIBC_2.1)
-libc.so.6(GLIBC_2.11)
 libc.so.6(GLIBC_2.1.3)
+libc.so.6(GLIBC_2.11)
 libc.so.6(GLIBC_2.2)
 libc.so.6(GLIBC_2.2.3)
 libc.so.6(GLIBC_2.3)
@@ -16,6 +26,7 @@ libc.so.6(GLIBC_2.3.4)
 libc.so.6(GLIBC_2.4)
 libc.so.6(GLIBC_2.6)
 libc.so.6(GLIBC_2.7)
+libcairo.so.2
 libcups.so.2
 libdbus-1.so.3
 libdl.so.2
@@ -28,8 +39,8 @@ libgcc_s.so.1
 libgcc_s.so.1(GCC_4.0.0)
 libgcc_s.so.1(GLIBC_2.0)
 libgconf-2.so.4
-libgdk_pixbuf-2.0.so.0
 libgdk-x11-2.0.so.0
+libgdk_pixbuf-2.0.so.0
 libgio-2.0.so.0
 libglib-2.0.so.0
 libgmodule-2.0.so.0
@@ -61,14 +72,3 @@ libstdc++.so.6(GLIBCXX_3.4.11)
 libstdc++.so.6(GLIBCXX_3.4.14)
 libstdc++.so.6(GLIBCXX_3.4.15)
 libstdc++.so.6(GLIBCXX_3.4.9)
-libX11.so.6
-libXcomposite.so.1
-libXcursor.so.1
-libXdamage.so.1
-libXext.so.6
-libXfixes.so.3
-libXi.so.6
-libXrandr.so.2
-libXrender.so.1
-libXss.so.1
-libXtst.so.6
diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64
index 9452235..df686df 100644
--- a/chrome/installer/linux/rpm/expected_deps_x86_64
+++ b/chrome/installer/linux/rpm/expected_deps_x86_64
@@ -1,18 +1,29 @@
 ld-linux-x86-64.so.2()(64bit)
 ld-linux-x86-64.so.2(GLIBC_2.2.5)(64bit)
+libX11.so.6()(64bit)
+libXcomposite.so.1()(64bit)
+libXcursor.so.1()(64bit)
+libXdamage.so.1()(64bit)
+libXext.so.6()(64bit)
+libXfixes.so.3()(64bit)
+libXi.so.6()(64bit)
+libXrandr.so.2()(64bit)
+libXrender.so.1()(64bit)
+libXss.so.1()(64bit)
+libXtst.so.6()(64bit)
 libasound.so.2()(64bit)
 libatk-1.0.so.0()(64bit)
-libcairo.so.2()(64bit)
 libc.so.6()(64bit)
 libc.so.6(GLIBC_2.11)(64bit)
 libc.so.6(GLIBC_2.2.5)(64bit)
+libc.so.6(GLIBC_2.3)(64bit)
 libc.so.6(GLIBC_2.3.2)(64bit)
 libc.so.6(GLIBC_2.3.4)(64bit)
-libc.so.6(GLIBC_2.3)(64bit)
 libc.so.6(GLIBC_2.4)(64bit)
 libc.so.6(GLIBC_2.6)(64bit)
 libc.so.6(GLIBC_2.7)(64bit)
 libc.so.6(GLIBC_2.9)(64bit)
+libcairo.so.2()(64bit)
 libcups.so.2()(64bit)
 libdbus-1.so.3()(64bit)
 libdl.so.2()(64bit)
@@ -24,8 +35,8 @@ libgcc_s.so.1()(64bit)
 libgcc_s.so.1(GCC_3.0)(64bit)
 libgcc_s.so.1(GCC_4.0.0)(64bit)
 libgconf-2.so.4()(64bit)
-libgdk_pixbuf-2.0.so.0()(64bit)
 libgdk-x11-2.0.so.0()(64bit)
+libgdk_pixbuf-2.0.so.0()(64bit)
 libgio-2.0.so.0()(64bit)
 libglib-2.0.so.0()(64bit)
 libgmodule-2.0.so.0()(64bit)
@@ -47,20 +58,9 @@ librt.so.1()(64bit)
 librt.so.1(GLIBC_2.2.5)(64bit)
 libsmime3.so()(64bit)
 libstdc++.so.6()(64bit)
+libstdc++.so.6(GLIBCXX_3.4)(64bit)
 libstdc++.so.6(GLIBCXX_3.4.10)(64bit)
 libstdc++.so.6(GLIBCXX_3.4.11)(64bit)
 libstdc++.so.6(GLIBCXX_3.4.14)(64bit)
 libstdc++.so.6(GLIBCXX_3.4.15)(64bit)
-libstdc++.so.6(GLIBCXX_3.4)(64bit)
 libstdc++.so.6(GLIBCXX_3.4.9)(64bit)
-libX11.so.6()(64bit)
-libXcomposite.so.1()(64bit)
-libXcursor.so.1()(64bit)
-libXdamage.so.1()(64bit)
-libXext.so.6()(64bit)
-libXfixes.so.3()(64bit)
-libXi.so.6()(64bit)
-libXrandr.so.2()(64bit)
-libXrender.so.1()(64bit)
-libXss.so.1()(64bit)
-libXtst.so.6()(64bit)