Fix test cases to work for i386.

gold/
	PR gold/21039
	* testsuite/script_test_13.sh: Adjust patterns to work for i386.
	* testsuite/script_test_15a.sh: Likewise.
	* testsuite/script_test_15b.sh: Likewise.
	* testsuite/script_test_15c.sh: Likewise.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1a3f9a0d82d76cea61dc3e199a60fd539444cb39..f97433adc47b1e65e2d213c1aceb33b06af05037 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,11 @@
+2017-01-11  Cary Coutant  <ccoutant@gmail.com>
+
+       PR gold/21039
+       * testsuite/script_test_13.sh: Adjust patterns to work for i386.
+       * testsuite/script_test_15a.sh: Likewise.
+       * testsuite/script_test_15b.sh: Likewise.
+       * testsuite/script_test_15c.sh: Likewise.
+
 2017-01-11  Alan Modra  <amodra@gmail.com>
 
        * powerpc.cc (class Powerpc_copy_relocs): New.

diff --git a/gold/testsuite/script_test_13.sh b/gold/testsuite/script_test_13.sh
index 6f578888ea6b946a84006889cce9851b90af0630..39bd30c6a8f2b894079fee8d85c720b58f46e33f 100755 (executable)
--- a/gold/testsuite/script_test_13.sh
+++ b/gold/testsuite/script_test_13.sh
@@ -38,4 +38,4 @@ check()
     fi
 }
 
-check "script_test_13.stdout" "\\.rela\\.dyn[[:space:]]\\+RELA[[:space:]]\\+0\\+10000\\b"
+check "script_test_13.stdout" "\.rela\?\.dyn[[:space:]]\+RELA\?[[:space:]]\+0\+10000\b"

diff --git a/gold/testsuite/script_test_15a.sh b/gold/testsuite/script_test_15a.sh
index dd038e8d615747b483c1100159bb132e2a0e1396..bfebb6bc1f0a1462fa5e55a6f4e893ec640c65ef 100755 (executable)
--- a/gold/testsuite/script_test_15a.sh
+++ b/gold/testsuite/script_test_15a.sh
@@ -37,5 +37,5 @@ check()
     fi
 }
 
-check script_test_15a.stdout "LOAD.*0x000... 0x001... RW"
-check script_test_15a.stdout "01.*\\.data .*\\.data.extra .*\\.bss"
+check script_test_15a.stdout "LOAD.*0x0\+0... 0x0\+1... RW"
+check script_test_15a.stdout "01.*\.data .*\.data.extra .*\.bss"

diff --git a/gold/testsuite/script_test_15b.sh b/gold/testsuite/script_test_15b.sh
index a902cafa195b3075d372d3992823f186cf770c7f..3f6444b8ec3479490f0c0a303c4daa17d5d30461 100755 (executable)
--- a/gold/testsuite/script_test_15b.sh
+++ b/gold/testsuite/script_test_15b.sh
@@ -38,5 +38,5 @@ check()
     fi
 }
 
-check script_test_15b.stdout "LOAD.*0x001... 0x001... RW"
-check script_test_15b.stdout "01.*\\.bss .*\\.data .*\\.data.extra"
+check script_test_15b.stdout "LOAD.*0x0\+1... 0x0\+1... RW"
+check script_test_15b.stdout "01.*\.bss .*\.data .*\.data.extra"

diff --git a/gold/testsuite/script_test_15c.sh b/gold/testsuite/script_test_15c.sh
index 3f7d581d73efb63c1e5d7a39252fa5ac774b589c..bb319ede45ef6b532c7fe7d7d65bbd9383439fc1 100755 (executable)
--- a/gold/testsuite/script_test_15c.sh
+++ b/gold/testsuite/script_test_15c.sh
@@ -38,5 +38,5 @@ check()
     fi
 }
 
-check script_test_15c.stdout "LOAD.*0x000... 0x001... RW"
-check script_test_15c.stdout "01.*\\.data .*\\.data.extra .*\\.bss"
+check script_test_15c.stdout "LOAD.*0x0\+0... 0x0\+1... RW"
+check script_test_15c.stdout "01.*\.data .*\.data.extra .*\.bss"