From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by sourceware.org (Postfix) with ESMTPS id CFD34387101B for ; Mon, 20 Feb 2023 10:21:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CFD34387101B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-lj1-x22c.google.com with SMTP id bx43so448713ljb.12 for ; Mon, 20 Feb 2023 02:21:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lz5yQdESvs6AAlhf8Ow7AW8ObTXP3aYudAejMx++mMw=; b=dWtff7OKh/DzlfEP3YmBNPleRl6gB10jgGgQr84he79ZM8qXAz4+SaHvhOM+DrhDeX xYdqPyRN8KhehGZrlG6PnKSyLOG9JWxL7oJeISXAtpx5AqE8E+B2fM/i7H0kSedhfMHh xlPeNl8uCPhOr+x6GiNZWQLyOT5xn9cNyR43DJ1pCvkLC5DV7K4OwRTBl6CjcuKXsPUx FC70XjJhIQA1ZsXgjAU6SSKfK/1cPRqJOr3rQeF/UKeTLnrdEpSlWBWfSpvAySjx1DLR lvsax423j5spbF8pgiXSZj0MMXvCWHhuA30ZwiPiVEbgaUNg56PxQvFujbYA/CZy8vyK vmQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lz5yQdESvs6AAlhf8Ow7AW8ObTXP3aYudAejMx++mMw=; b=z0btfmK04qeRblyqZxzdg2qYslBuot2mgpDkYz2tgAQv22GxUjVZTgEUPhcu0c81xg lft/ljNYvRHp/b8YNM8f9w/wxDLahPxPpdN+LMhbjtuSO+m3JVREPwbplNHxjsT8Fp/5 HgwHdw/cO3eczXPifdt2R7WdLlGA0S90qVgBArJI1FmAtL1fz1cLVAqKeBUZJGYn2VvV HxpufJOKEWxoMZYGBxuVFJcfInLGWi6YeRo9R91L0SSLabDY5gNVDluEXtCHPKoLEVjs p8vYVgU4dEZDrlaeg/o8F19P7BacqyZXofmro/ztpstJwH/lo/nntfApc9qWKi7vNl3r oRFQ== X-Gm-Message-State: AO0yUKVdIk4WWH+ti57UgxQ2pKzystRin+di5yItY/axVJ/seXqoUiF2 r/qeT6XyXRPl7fbAzjgv3PbTaGIB0tRSH/bb X-Google-Smtp-Source: AK7set8bNQeFSzm2vrpd73uTzX6QxMojXD38MiZH+/CHpli9Sj61t5GxmXSEii/Lh6ALYspo6Cr9mg== X-Received: by 2002:a05:600c:3095:b0:3dc:555c:dd30 with SMTP id g21-20020a05600c309500b003dc555cdd30mr5374852wmn.27.1676881372404; Mon, 20 Feb 2023 00:22:52 -0800 (PST) Received: from chigot-Dell.home ([2a01:cb15:8123:8100:c288:32ca:f666:6773]) by smtp.gmail.com with ESMTPSA id z8-20020a1c4c08000000b003e1f319b87bsm13336888wmf.24.2023.02.20.00.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 00:22:51 -0800 (PST) From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= To: binutils@sourceware.org Cc: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Subject: [PATCH 3/4] ld/testsuite: adjust to Windows path separator. Date: Mon, 20 Feb 2023 09:22:23 +0100 Message-Id: <20230220082224.415968-3-chigot@adacore.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230220082224.415968-1-chigot@adacore.com> References: <20230220082224.415968-1-chigot@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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