MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix x86 ld testsuite fails with glibc < 2.28

Browse Source 
* testsuite/ld-elf/linux-x86.exp: Build tests when non-native.
	(check_pr25749b): Add optional args.  Set expected pass file
	from args.  Run -1b and -2a tests with passall.out.
	* testsuite/ld-elf/passall.out: New file.
	* testsuite/ld-elf/pr25749-1.c: Adjust to pass with older glibc.
	* testsuite/ld-elf/pr25749-2.c: Likewise.
	* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use
	regexp_diff to compare expected output from running binary.
This commit is contained in:
Alan Modra 2020-06-10 13:08:15 +09:30
parent 7ab9679411
commit 84df1f9dcb
6 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ld/ChangeLog
View File

@ -1,3 +1,14 @@
2020-06-10 Alan Modra <amodra@gmail.com>
* testsuite/ld-elf/linux-x86.exp: Build tests when non-native.
(check_pr25749b): Add optional args. Set expected pass file
from args. Run -1b and -2a tests with passall.out.
* testsuite/ld-elf/passall.out: New file.
* testsuite/ld-elf/pr25749-1.c: Adjust to pass with older glibc.
* testsuite/ld-elf/pr25749-2.c: Likewise.
* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use
regexp_diff to compare expected output from running binary.
2020-06-10 H.J. Lu <hongjiu.lu@intel.com>
PR ld/26094

22
ld/testsuite/ld-elf/linux-x86.exp
View File

@ -48,10 +48,6 @@ run_ld_link_tests [list \
]
# Test very simple native Linux/x86 programs with linux-x86.S.
if { ![isnative] || ![check_compiler_available] } {
return
}
run_ld_link_exec_tests [list \
[list \
"Run PR ld/23428 test" \
@ -215,7 +211,7 @@ if { [istarget "i?86-*-linux*"] } {
}
}
proc check_pr25749b {testname srcfilea srcfileb cflags ldflags dsoldflags} {
proc check_pr25749b {testname srcfilea srcfileb cflags ldflags dsoldflags args} {
global objcopy
global srcdir
global subdir
@ -253,6 +249,12 @@ proc check_pr25749b {testname srcfilea srcfileb cflags ldflags dsoldflags} {
"lib${testname}.so" \
] \
]
set pass "pass.out"
if { [llength $args] > 0 } {
set pass [lindex $args 0]
}
run_ld_link_exec_tests [list \
[list \
"Run ${testname}b ($ldflags $cflags)" \
@ -260,7 +262,7 @@ proc check_pr25749b {testname srcfilea srcfileb cflags ldflags dsoldflags} {
"" \
[list $srcfilea]\
"${testname}b" \
"pass.out" \
"$pass" \
"$cflags -I../bfd" \
] \
]
@ -269,13 +271,13 @@ proc check_pr25749b {testname srcfilea srcfileb cflags ldflags dsoldflags} {
check_pr25749b "pr25749-1a" "pr25749-1.c" "pr25749-1a.c" "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS" ""
check_pr25749b "pr25749-1a" "pr25749-1.c" "pr25749-1a.c" "-fPIE" "-pie" ""
check_pr25749b "pr25749-1a" "pr25749-1.c" "pr25749-1a.c" "-fPIE" "-pie" "-Wl,-Bsymbolic"
check_pr25749b "pr25749-1b" "pr25749-1.c" "pr25749-1b.c" "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS" ""
check_pr25749b "pr25749-1b" "pr25749-1.c" "pr25749-1b.c" "-fPIE" "-pie" ""
check_pr25749b "pr25749-1b" "pr25749-1.c" "pr25749-1b.c" "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS" "" "passall.out"
check_pr25749b "pr25749-1b" "pr25749-1.c" "pr25749-1b.c" "-fPIE" "-pie" "" "passall.out"
check_pr25749b "pr25749-1b" "pr25749-1.c" "pr25749-1b.c" "-fPIE" "-pie" "-Wl,-Bsymbolic"
check_pr25749b "pr25749-1d" "pr25749-1.c" "pr25749-1d.c" "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS" "-Wl,-defsym=_begin=0"
check_pr25749b "pr25749-1d" "pr25749-1.c" "pr25749-1d.c" "-fPIE" "-pie" "-Wl,-defsym=_begin=0"
check_pr25749b "pr25749-1d" "pr25749-1.c" "pr25749-1d.c" "-fPIE" "-pie" "-Wl,-Bsymbolic -Wl,-defsym=_begin=0"
check_pr25749b "pr25749-2a" "pr25749-2.c" "pr25749-2a.s" "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS" ""
check_pr25749b "pr25749-2a" "pr25749-2.c" "pr25749-2a.s" "-fPIE" "-pie" ""
check_pr25749b "pr25749-2a" "pr25749-2.c" "pr25749-2a.s" "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS" "" "passall.out"
check_pr25749b "pr25749-2a" "pr25749-2.c" "pr25749-2a.s" "-fPIE" "-pie" "" "passall.out"
check_pr25749b "pr25749-2b" "pr25749-2.c" "pr25749-2b.s" "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS" ""
check_pr25749b "pr25749-2b" "pr25749-2.c" "pr25749-2b.s" "-fPIE" "-pie" ""

1
ld/testsuite/ld-elf/passall.out Normal file
View File

@ -0,0 +1 @@
PASS.*

8
ld/testsuite/ld-elf/pr25749-1.c
View File

@ -6,7 +6,13 @@ extern intptr_t size (void);
int
main ()
{
if (size () == 147)
if (size () == 303 /* size of this file */)
printf ("PASS\n");
#ifdef __GLIBC_PREREQ
# if !__GLIBC_PREREQ (2, 28)
else
printf ("PASS (incorrect result due to glibc bug)\n");
# endif
#endif
return 0;
}

8
ld/testsuite/ld-elf/pr25749-2.c
View File

@ -6,7 +6,13 @@ extern intptr_t size;
int
main ()
{
if (size == 137)
if (size == 293 /* size of this file */)
printf ("PASS\n");
#ifdef __GLIBC_PREREQ
# if !__GLIBC_PREREQ (2, 28)
else
printf ("PASS (incorrect result due to glibc bug)\n");
# endif
#endif
return 0;
}

11
ld/testsuite/lib/ld-lib.exp
View File

@ -773,14 +773,9 @@ proc run_ld_link_exec_tests { ldtests args } {
verbose "$exec_output" 1
set failed 1
} else {
send_log "diff $binfile.out $srcdir/$subdir/$expfile\n"
verbose "diff $binfile.out $srcdir/$subdir/$expfile"
catch "exec diff $binfile.out $srcdir/$subdir/$expfile" exec_output
set exec_output [prune_warnings $exec_output]
if ![string match "" $exec_output] then {
send_log "$exec_output\n"
verbose "$exec_output" 1
send_log [file_contents $binfile.out]
verbose [file_contents $binfile.out] 2
if [regexp_diff "$binfile.out" "$srcdir/$subdir/$expfile"] {
set failed 1
}
}