* testsuite/final_layout.sh: Rewrite to not use dc.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index dacc36a6299627b66ceb660aeb821ef82334f7e1..ca1ae8ce5a16b11fe3da5e2cb821dab783a3f29a 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-21  Ian Lance Taylor  <iant@google.com>
+
+       * testsuite/final_layout.sh: Rewrite to not use dc.
+
 2011-03-21  Sriraman Tallam  <tmsriram@google.com>
 
        * testsuite/icf_safe_so_test.sh: Add #!/bin/sh to start.

diff --git a/gold/testsuite/final_layout.sh b/gold/testsuite/final_layout.sh
index 01b1f1d987b39d6c797699e342f9e762620e1a1d..83f9361b040be17eb8b8ddbfd4b4ec0a00fe1e5a 100755 (executable)
--- a/gold/testsuite/final_layout.sh
+++ b/gold/testsuite/final_layout.sh
@@ -25,17 +25,34 @@
 # The goal of this program is to verify if --section-ordering-file works as
 # intended.  File final_layout.cc is in this test.
 
+set -e
+
 check()
 {
-    func_addr_1=`grep $2 $1 | awk '{print $1}' | tr 'abcdef' 'ABCDEF'`
-    func_addr_1=`echo 16i${func_addr_1}p | dc`
-    func_addr_2=`grep $3 $1 | awk '{print $1}' | tr 'abcdef' 'ABCDEF'`
-    func_addr_2=`echo 16i${func_addr_2}p | dc`
-    if [ $func_addr_1 -gt $func_addr_2 ]
-    then
-        echo "final layout of" $2 "and" $3 "is not right."
-       exit 1
-    fi
+    awk "
+BEGIN { saw1 = 0; saw2 = 0; err = 0; }
+/.*$2\$/ { saw1 = 1; }
+/.*$3\$/ {
+     saw2 = 1;
+     if (!saw1)
+       {
+         printf \"layout of $2 and $3 is not right\\n\";
+         err = 1;
+         exit 1;
+       }
+    }
+END {
+      if (!saw1 && !err)
+        {
+         printf \"did not see $2\\n\";
+         exit 1;
+       }
+      if (!saw2 && !err)
+       {
+         printf \"did not see $3\\n\";
+         exit 1;
+       }
+    }" $1
 }
 
 check final_layout.stdout "_Z3barv" "_Z3bazv"