[binutils-gdb] ld/testsuite: adjust to Windows path separator.

[binutils-gdb] ld/testsuite: adjust to Windows path separator.

[Cl?ment Chigot]

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

commit df937aa12a387ea743eb413a719253ec0ffe131b
Author: Clément Chigot <chigot@adacore.com>
Date:   Thu Jan 12 11:02:25 2023 +0100

    ld/testsuite: adjust to Windows path separator.
    
    In some tests, the path reported on Windows will have a \ instead of a
    /. This occurs when a file is concatened with the search path in
    ldfile.c.:  "ld -Ltmpdir -ltext" will result into "tmpdir\libtext.a".
    
    ld/ChangeLog:
    
            * testsuite/ld-elf/retain5.map: Allow \ path separator.
            * testsuite/ld-plugin/plugin-10.d: Likewise.
            * testsuite/ld-plugin/plugin-11.d: Likewise.
            * testsuite/ld-plugin/plugin-18.d: Likewise.
            * testsuite/ld-plugin/plugin-19.d: Likewise.
            * testsuite/ld-plugin/plugin-20.d: Likewise.
            * testsuite/ld-plugin/plugin-22.d: Likewise.

Diff:
---
 ld/testsuite/ld-elf/retain5.map    | 2 +-
 ld/testsuite/ld-plugin/plugin-10.d | 2 +-
 ld/testsuite/ld-plugin/plugin-11.d | 2 +-
 ld/testsuite/ld-plugin/plugin-18.d | 2 +-
 ld/testsuite/ld-plugin/plugin-19.d | 2 +-
 ld/testsuite/ld-plugin/plugin-20.d | 2 +-
 ld/testsuite/ld-plugin/plugin-22.d | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ld/testsuite/ld-elf/retain5.map b/ld/testsuite/ld-elf/retain5.map
index 6b97c2a2206..0e919113f72 100644
--- a/ld/testsuite/ld-elf/retain5.map
+++ b/ld/testsuite/ld-elf/retain5.map
@@ -1,5 +1,5 @@
 # Check that the library was actually loaded to catch any false PASS.
 
 #...
-LOAD tmpdir/libretain5.a
+LOAD tmpdir[/\\]libretain5.a
 #pass
diff --git a/ld/testsuite/ld-plugin/plugin-10.d b/ld/testsuite/ld-plugin/plugin-10.d
index 3818bf7bb2f..f92ee650c13 100644
--- a/ld/testsuite/ld-plugin/plugin-10.d
+++ b/ld/testsuite/ld-plugin/plugin-10.d
@@ -29,7 +29,7 @@ Hello from testplugin.
 hook called: claim_file tmpdir/main.o \[@0/.* not claimed
 hook called: claim_file tmpdir/func.o \[@0/.* CLAIMED
 #...
-hook called: claim_file tmpdir/libtext.a \[@.* not claimed
+hook called: claim_file tmpdir[/\\]libtext.a \[@.* not claimed
 #...
 hook called: all symbols read.
 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
diff --git a/ld/testsuite/ld-plugin/plugin-11.d b/ld/testsuite/ld-plugin/plugin-11.d
index 10b80288606..6a5abcfc060 100644
--- a/ld/testsuite/ld-plugin/plugin-11.d
+++ b/ld/testsuite/ld-plugin/plugin-11.d
@@ -32,7 +32,7 @@ Hello from testplugin.
 hook called: claim_file tmpdir/main.o \[@0/.* not claimed
 hook called: claim_file tmpdir/func.o \[@0/.* CLAIMED
 #...
-hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
+hook called: claim_file tmpdir[/\\]libtext.a \[@.* CLAIMED
 #...
 hook called: all symbols read.
 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
diff --git a/ld/testsuite/ld-plugin/plugin-18.d b/ld/testsuite/ld-plugin/plugin-18.d
index 0200a05cfd6..284fd057686 100644
--- a/ld/testsuite/ld-plugin/plugin-18.d
+++ b/ld/testsuite/ld-plugin/plugin-18.d
@@ -29,7 +29,7 @@ Hello from testplugin.
 hook called: claim_file tmpdir/main.o \[@0/.* not claimed
 hook called: claim_file .*/ld/testsuite/ld-plugin/func.c \[@0/.* CLAIMED
 #...
-hook called: claim_file tmpdir/libtext.a \[@.* not claimed
+hook called: claim_file tmpdir[/\\]libtext.a \[@.* not claimed
 #...
 hook called: all symbols read.
 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
diff --git a/ld/testsuite/ld-plugin/plugin-19.d b/ld/testsuite/ld-plugin/plugin-19.d
index e838028fd36..621ee7689f0 100644
--- a/ld/testsuite/ld-plugin/plugin-19.d
+++ b/ld/testsuite/ld-plugin/plugin-19.d
@@ -32,7 +32,7 @@ Hello from testplugin.
 hook called: claim_file tmpdir/main.o \[@0/.* not claimed
 hook called: claim_file .*/ld/testsuite/ld-plugin/func.c \[@0/.* CLAIMED
 #...
-hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
+hook called: claim_file tmpdir[/\\]libtext.a \[@.* CLAIMED
 #...
 hook called: all symbols read.
 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
diff --git a/ld/testsuite/ld-plugin/plugin-20.d b/ld/testsuite/ld-plugin/plugin-20.d
index 31bc3766162..e3c724df636 100644
--- a/ld/testsuite/ld-plugin/plugin-20.d
+++ b/ld/testsuite/ld-plugin/plugin-20.d
@@ -1,5 +1,5 @@
 hook called: all symbols read.
-Input: func.c \(tmpdir/libfunc.a\)
+Input: func.c \(tmpdir[/\\]libfunc.a\)
 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
 .*: tmpdir/main.o: in function `main':
diff --git a/ld/testsuite/ld-plugin/plugin-22.d b/ld/testsuite/ld-plugin/plugin-22.d
index 1084a0b00cf..381ac03c052 100644
--- a/ld/testsuite/ld-plugin/plugin-22.d
+++ b/ld/testsuite/ld-plugin/plugin-22.d
@@ -1,4 +1,4 @@
-Claimed: tmpdir/libfunc.a \[@.*
+Claimed: tmpdir[/\\]libfunc.a \[@.*
 hook called: all symbols read.
 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*