From f1848b0a0ed70fc91eff50f6c47561ca24362a37 Mon Sep 17 00:00:00 2001 From: Ashay Rane Date: Tue, 13 Sep 2022 08:20:26 -0500 Subject: [PATCH] [clang] fix linker executable path in test A previous patch (https://reviews.llvm.org/D132810) introduced a test that fails on systems where the linker executable (`ld`) has a `.exe` extension. This patch updates the regex in the test so that lit can look for both `ld` as well as `ld.exe`. Reviewed By: stella.stamenova Differential Revision: https://reviews.llvm.org/D133773 --- clang/test/Driver/mingw-cfguard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/test/Driver/mingw-cfguard.c b/clang/test/Driver/mingw-cfguard.c index f88fd59098b8..d9297042b10e 100644 --- a/clang/test/Driver/mingw-cfguard.c +++ b/clang/test/Driver/mingw-cfguard.c @@ -3,7 +3,7 @@ // NO_CF: "-cc1" // NO_CF-NOT: "-cfguard" // NO_CF-NOT: "-cfguard-no-checks" -// NO_CF-NEXT: ld" +// NO_CF-NEXT: ld{{(.lld)?}}{{(.exe)?}}" // NO_CF-NOT: "--guard-cf" // DEFAULT-NOT: "--no-guard-cf" // GUARD_NONE-SAME: "--no-guard-cf" @@ -11,7 +11,7 @@ // RUN: %clang --target=x86_64-w64-windows-gnu -### %s -mguard=cf 2>&1 | FileCheck -check-prefix=GUARD_CF %s // GUARD_CF: "-cc1" // GUARD_CF-SAME: "-cfguard" -// GUARD_CF-NEXT: ld" +// GUARD_CF-NEXT: ld{{(.lld)?}}{{(.exe)?}}" // GUARD_CF-SAME: "--guard-cf" // GUARD_CF-NOT: "--no-guard-cf" @@ -20,7 +20,7 @@ // GUARD_NOCHECKS-NOT: "-cfguard" // GUARD_NOCHECKS-SAME: "-cfguard-no-checks" // GUARD_NOCHECKS-NOT: "-cfguard" -// GUARD_NOCHECKS-NEXT: ld" +// GUARD_NOCHECKS-NEXT: ld{{(.lld)?}}{{(.exe)?}}" // GUARD_NOCHECKS-SAME: "--guard-cf" // GUARD_NOCHECKS-NOT: "--no-guard-cf"