diff options
| author | Alan Modra <amodra@gmail.com> | 2009-09-23 03:12:28 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2009-09-23 03:12:28 +0000 |
| commit | f9272224cdd8ee09437255989d70d3f2284de413 (patch) | |
| tree | 942833fc405688cc4f248a45c82ace9a32d6afdc /ld/testsuite/ld-elf | |
| parent | dfc3ab44df77a8842c24ab2fc6ea2aa3ad880aed (diff) | |
| download | gdb-f9272224cdd8ee09437255989d70d3f2284de413.zip gdb-f9272224cdd8ee09437255989d70d3f2284de413.tar.gz gdb-f9272224cdd8ee09437255989d70d3f2284de413.tar.bz2 | |
Tolerate some whitespace differences in readelf output.
Diffstat (limited to 'ld/testsuite/ld-elf')
| -rw-r--r-- | ld/testsuite/ld-elf/empty.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/group1.d | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/group3a.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/group3b.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/hash.d | 10 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/warn1.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/warn2.d | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/ld/testsuite/ld-elf/empty.d b/ld/testsuite/ld-elf/empty.d index ecf8aea..836206e 100644 --- a/ld/testsuite/ld-elf/empty.d +++ b/ld/testsuite/ld-elf/empty.d @@ -3,5 +3,5 @@ #readelf: -s #... -[ ]+[0-9]+:[ ]+[0-9a-f]+[ ]+[0-9]+[ ]+FUNC[ ]+GLOBAL DEFAULT[ ]+[1-9] _start + +[0-9]+: +[0-9a-f]+ +[0-9]+ +FUNC +GLOBAL +DEFAULT +[1-9] _start #pass diff --git a/ld/testsuite/ld-elf/group1.d b/ld/testsuite/ld-elf/group1.d index 0d65932..4c9558b 100644 --- a/ld/testsuite/ld-elf/group1.d +++ b/ld/testsuite/ld-elf/group1.d @@ -5,6 +5,6 @@ #xfail: "arc-*-*" "d30v-*-*" "dlx-*-*" "i960-*-*" "or32-*-*" "pj-*-*" Symbol table '.symtab' contains .* entries: #... - .*: 0[0]*1000 0 (NOTYPE|OBJECT) WEAK DEFAULT . foo - .*: 0[0]*0000 0 (NOTYPE|OBJECT) GLOBAL DEFAULT UND bar +.*: 0+1000 +0 +(NOTYPE|OBJECT) +WEAK +DEFAULT +. foo +.*: 0+0000 +0 +(NOTYPE|OBJECT) +GLOBAL +DEFAULT +UND bar #... diff --git a/ld/testsuite/ld-elf/group3a.d b/ld/testsuite/ld-elf/group3a.d index 83c5161..10c0cf2 100644 --- a/ld/testsuite/ld-elf/group3a.d +++ b/ld/testsuite/ld-elf/group3a.d @@ -4,5 +4,5 @@ #readelf: -s Symbol table '.symtab' contains .* entries: #... - .*: 0[0]*1000 0 OBJECT GLOBAL HIDDEN . foo +.*: 0+1000 +0 +OBJECT +GLOBAL +HIDDEN +. foo #... diff --git a/ld/testsuite/ld-elf/group3b.d b/ld/testsuite/ld-elf/group3b.d index 82c18e4..a961301 100644 --- a/ld/testsuite/ld-elf/group3b.d +++ b/ld/testsuite/ld-elf/group3b.d @@ -4,5 +4,5 @@ #readelf: -s Symbol table '.symtab' contains .* entries: #... - .*: 0[0]*1000 0 OBJECT GLOBAL HIDDEN . foo +.*: 0+1000 +0 +OBJECT +GLOBAL +HIDDEN +. foo #... diff --git a/ld/testsuite/ld-elf/hash.d b/ld/testsuite/ld-elf/hash.d index b3769aa..9bcd9a9 100644 --- a/ld/testsuite/ld-elf/hash.d +++ b/ld/testsuite/ld-elf/hash.d @@ -5,13 +5,13 @@ #notarget: mips*-*-* #... -[ ]*0x[0-9a-z]+[ ]+\(GNU_HASH\)[ ]+0x[0-9a-z]+ + +0x[0-9a-z]+ +\(GNU_HASH\) +0x[0-9a-z]+ #... -[ ]+[0-9]+[ ]+[0-9]+:[ ]+[0-9a-f]+[ ]+[0-9]+[ ]+NOTYPE[ ]+GLOBAL DEFAULT[ ]+[1-9] _start + +[0-9]+ +[0-9]+: +[0-9a-f]+ +[0-9]+ +NOTYPE +GLOBAL +DEFAULT +[1-9] _start #... -[ ]+[0-9]+[ ]+[0-9]+:[ ]+[0-9a-f]+[ ]+[0-9]+[ ]+NOTYPE[ ]+GLOBAL DEFAULT[ ]+[1-9] main + +[0-9]+ +[0-9]+: +[0-9a-f]+ +[0-9]+ +NOTYPE +GLOBAL +DEFAULT +[1-9] main #... -[ ]+[0-9]+[ ]+[0-9]+:[ ]+[0-9a-f]+[ ]+[0-9]+[ ]+NOTYPE[ ]+GLOBAL DEFAULT[ ]+[1-9] start + +[0-9]+ +[0-9]+: +[0-9a-f]+ +[0-9]+ +NOTYPE +GLOBAL +DEFAULT +[1-9] start #... -[ ]+[0-9]+[ ]+[0-9]+:[ ]+[0-9a-f]+[ ]+[0-9]+[ ]+NOTYPE[ ]+GLOBAL DEFAULT[ ]+[1-9] __start + +[0-9]+ +[0-9]+: +[0-9a-f]+ +[0-9]+ +NOTYPE +GLOBAL +DEFAULT +[1-9] __start #... diff --git a/ld/testsuite/ld-elf/warn1.d b/ld/testsuite/ld-elf/warn1.d index 7beb9da..3ef5032 100644 --- a/ld/testsuite/ld-elf/warn1.d +++ b/ld/testsuite/ld-elf/warn1.d @@ -11,5 +11,5 @@ # construct and that the symbol still appears as expected. #... -[ ]+[0-9]+:[ ]+[0-9a-f]+[ ]+[48][ ]+FUNC[ ]+GLOBAL DEFAULT[ ]+[1-9] symbol1 + +[0-9]+: +[0-9a-f]+ +[48] +FUNC +GLOBAL +DEFAULT +[1-9] symbol1 #pass diff --git a/ld/testsuite/ld-elf/warn2.d b/ld/testsuite/ld-elf/warn2.d index 946603e..c2ff12a 100644 --- a/ld/testsuite/ld-elf/warn2.d +++ b/ld/testsuite/ld-elf/warn2.d @@ -11,5 +11,5 @@ # construct and that the symbol still appears as expected. #... -[ ]+[0-9]+:[ ]+[0-9a-f]+[ ]+20[ ]+OBJECT[ ]+GLOBAL DEFAULT[ ]+[1-3] Foo + +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +[1-3] Foo #pass |