From: "Clément Chigot" <chigot@adacore.com>
To: binutils@sourceware.org
Cc: "Clément Chigot" <chigot@adacore.com>
Subject: [PATCH 3/4] ld/testsuite: adjust to Windows path separator.
Date: Mon, 20 Feb 2023 09:22:23 +0100 [thread overview]
Message-ID: <20230220082224.415968-3-chigot@adacore.com> (raw)
In-Reply-To: <20230220082224.415968-1-chigot@adacore.com>
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.
---
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.*
--
2.25.1
next prev parent reply other threads:[~2023-02-20 10:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 8:22 [PATCH 1/4] gas/testsuite: adjust a test for case insensitive file systems Clément Chigot
2023-02-20 8:22 ` [PATCH 2/4] ld/testsuite: don't output to /dev/null on mingw hosts Clément Chigot
2023-02-20 10:59 ` Alan Modra
2023-02-20 8:22 ` Clément Chigot [this message]
2023-02-20 11:00 ` [PATCH 3/4] ld/testsuite: adjust to Windows path separator Alan Modra
2023-02-20 8:22 ` [PATCH 4/4] ld/testsuite: handle Windows drive letter in a noinit test Clément Chigot
2023-02-20 11:02 ` Alan Modra
2023-02-20 10:52 ` [PATCH 1/4] gas/testsuite: adjust a test for case insensitive file systems Alan Modra
2023-02-21 8:30 ` Jan Beulich
2023-02-21 8:40 ` Jan Beulich
2023-02-21 9:02 ` Clément Chigot
2023-02-21 9:28 ` Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230220082224.415968-3-chigot@adacore.com \
--to=chigot@adacore.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).