From cc26d6caf1e36d6d2cd8ee6f4c206fe68d597e5e Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 27 Dec 2024 11:37:05 +0100 Subject: ld/testsuite: replace aarch64 uses of load_lib Using $srcdir/$subdir directly doesn't work, at least not with expect 5.45, dejagnu 1.6, and an out-of-tree build (I assume it's the latter aspect which is crucial here). Make use of load_file instead. --- ld/testsuite/ld-aarch64/aarch64-elf.exp | 2 +- ld/testsuite/ld-aarch64/protections/aarch64-protections.exp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ld/testsuite') diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index e65d4ce..54539b3 100644 --- a/ld/testsuite/ld-aarch64/aarch64-elf.exp +++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp @@ -23,7 +23,7 @@ if { ![is_elf_format] || ![istarget "aarch64*-*-*"] } { return } -load_lib $srcdir/$subdir/lib/aarch64-elf-lib.exp +load_file $srcdir/$subdir/lib/aarch64-elf-lib.exp # List contains test-items with 3 items followed by 2 lists: # 0:name 1:ld early options 2:ld late options 3:assembler options diff --git a/ld/testsuite/ld-aarch64/protections/aarch64-protections.exp b/ld/testsuite/ld-aarch64/protections/aarch64-protections.exp index 471afa1..68b9995 100644 --- a/ld/testsuite/ld-aarch64/protections/aarch64-protections.exp +++ b/ld/testsuite/ld-aarch64/protections/aarch64-protections.exp @@ -23,7 +23,7 @@ if { ![is_elf_format] || ![istarget "aarch64*-*-*"] } { return } -load_lib $srcdir/$subdir/../lib/aarch64-elf-lib.exp +load_file $srcdir/$subdir/../lib/aarch64-elf-lib.exp set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]] set test_lp64_list [lsort [glob -nocomplain $srcdir/$subdir/bti-far-*.d]] -- cgit v1.1