[binutils-gdb] ld/testsuite: replace aarch64 uses of load_lib

Jan Beulich jbeulich@sourceware.org
Fri Dec 27 10:38:25 GMT 2024


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cc26d6caf1e36d6d2cd8ee6f4c206fe68d597e5e

commit cc26d6caf1e36d6d2cd8ee6f4c206fe68d597e5e
Author: Jan Beulich <jbeulich@suse.com>
Date:   Fri Dec 27 11:37:05 2024 +0100

    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.

Diff:
---
 ld/testsuite/ld-aarch64/aarch64-elf.exp                     | 2 +-
 ld/testsuite/ld-aarch64/protections/aarch64-protections.exp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index e65d4ce5a3d..54539b3d2cd 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 471afa13a63..68b99959285 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]]


More information about the Binutils-cvs mailing list