From 1fa5f68bf38fc29f173990614db70fed1b66c0e0 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Wed, 11 Jan 2017 11:26:26 -0800 Subject: [PATCH] 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. --- gold/ChangeLog | 8 ++++++++ gold/testsuite/script_test_13.sh | 2 +- gold/testsuite/script_test_15a.sh | 4 ++-- gold/testsuite/script_test_15b.sh | 4 ++-- gold/testsuite/script_test_15c.sh | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 1a3f9a0d82d..f97433adc47 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,11 @@ +2017-01-11 Cary Coutant + + 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 * powerpc.cc (class Powerpc_copy_relocs): New. diff --git a/gold/testsuite/script_test_13.sh b/gold/testsuite/script_test_13.sh index 6f578888ea6..39bd30c6a8f 100755 --- 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 dd038e8d615..bfebb6bc1f0 100755 --- 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 a902cafa195..3f6444b8ec3 100755 --- 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 3f7d581d73e..bb319ede45e 100755 --- 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" -- 2.30.2