add an msysize patch to deal with the fallout of teaching the Cygwin driver how to call the linker directly instead of using GCC to do it
171 lines
7.6 KiB
Diff
171 lines
7.6 KiB
Diff
From aefec16ab84d7b33adbb70814fec2a5b45c89922 Mon Sep 17 00:00:00 2001
|
|
From: jeremyd2019 <github@jdrake.com>
|
|
Date: Fri, 8 Aug 2025 13:29:00 -0700
|
|
Subject: [PATCH] [Tests] Add system-cygwin feature, and use it. (#152611)
|
|
|
|
Several Clang tests were failing on Cygwin, and were already marked as
|
|
requiring !system-windows, unsupported on system-windows, or xfail on
|
|
system-windows. Add system-cygwin to lit's llvm.config, and use it in
|
|
such tests in addition to system-windows.
|
|
|
|
(cherry picked from commit ff616b4806ed6c9b9698290a9c807626aa3844f7)
|
|
---
|
|
clang/test/CodeGen/2007-06-18-SextAttrAggregate.c | 2 +-
|
|
clang/test/CodeGen/debug-info-version.c | 2 +-
|
|
clang/test/CodeGenCXX/modules-vtable.cppm | 2 +-
|
|
clang/test/CodeGenCXX/pr70585.cppm | 2 +-
|
|
clang/test/Driver/cuda-detect-path.cu | 2 +-
|
|
clang/test/Driver/hipspv-toolchain.hip | 2 +-
|
|
clang/test/Driver/ld-path.c | 2 +-
|
|
clang/test/Driver/program-path-priority.c | 2 +-
|
|
clang/test/Driver/spirv-toolchain.cl | 2 +-
|
|
clang/test/Interpreter/simple-exception.cpp | 2 +-
|
|
clang/test/Lexer/cross-windows-on-linux.cpp | 2 +-
|
|
clang/test/Modules/pr97313.cppm | 2 +-
|
|
clang/test/Preprocessor/file_test.c | 2 +-
|
|
13 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c b/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c
|
|
index daed3baf46..ccfdc1a1c6 100644
|
|
--- a/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c
|
|
+++ b/clang/test/CodeGen/2007-06-18-SextAttrAggregate.c
|
|
@@ -1,5 +1,5 @@
|
|
// RUN: %clang_cc1 -no-enable-noundef-analysis %s -o - -emit-llvm | FileCheck %s
|
|
-// XFAIL: target={{(aarch64|arm64).*}}, target=x86_64-pc-windows-msvc, target=x86_64-{{(pc|w64)}}-windows-gnu
|
|
+// XFAIL: target={{(aarch64|arm64).*}}, target=x86_64-pc-windows-msvc, target=x86_64-{{(pc|w64)}}-windows-gnu, target=x86_64-pc-windows-cygnus
|
|
|
|
// PR1513
|
|
|
|
diff --git a/clang/test/CodeGen/debug-info-version.c b/clang/test/CodeGen/debug-info-version.c
|
|
index c7c2bb9501..485b80e2a5 100644
|
|
--- a/clang/test/CodeGen/debug-info-version.c
|
|
+++ b/clang/test/CodeGen/debug-info-version.c
|
|
@@ -1,4 +1,4 @@
|
|
-// REQUIRES: !system-windows
|
|
+// REQUIRES: !system-windows, !system-cygwin
|
|
// RUN: %clang -g -S -emit-llvm -o - %s | FileCheck %s
|
|
// RUN: %clang -S -emit-llvm -o - %s | FileCheck %s --check-prefix=NO_DEBUG
|
|
int main (void) {
|
|
diff --git a/clang/test/CodeGenCXX/modules-vtable.cppm b/clang/test/CodeGenCXX/modules-vtable.cppm
|
|
index 6589b9f3c5..75f7598a63 100644
|
|
--- a/clang/test/CodeGenCXX/modules-vtable.cppm
|
|
+++ b/clang/test/CodeGenCXX/modules-vtable.cppm
|
|
@@ -1,4 +1,4 @@
|
|
-// REQUIRES: !system-windows
|
|
+// REQUIRES: !system-windows, !system-cygwin
|
|
|
|
// RUN: rm -rf %t
|
|
// RUN: split-file %s %t
|
|
diff --git a/clang/test/CodeGenCXX/pr70585.cppm b/clang/test/CodeGenCXX/pr70585.cppm
|
|
index ad4e13589d..d44a4f4972 100644
|
|
--- a/clang/test/CodeGenCXX/pr70585.cppm
|
|
+++ b/clang/test/CodeGenCXX/pr70585.cppm
|
|
@@ -1,4 +1,4 @@
|
|
-// REQUIRES: !system-windows
|
|
+// REQUIRES: !system-windows, !system-cygwin
|
|
|
|
// RUN: rm -rf %t
|
|
// RUN: split-file %s %t
|
|
diff --git a/clang/test/Driver/cuda-detect-path.cu b/clang/test/Driver/cuda-detect-path.cu
|
|
index 8d249bd4c9..ce42ed75f7 100644
|
|
--- a/clang/test/Driver/cuda-detect-path.cu
|
|
+++ b/clang/test/Driver/cuda-detect-path.cu
|
|
@@ -1,5 +1,5 @@
|
|
// This tests uses the PATH environment variable.
|
|
-// REQUIRES: !system-windows
|
|
+// REQUIRES: !system-windows, !system-cygwin
|
|
|
|
// RUN: env PATH=%S/Inputs/CUDA/usr/local/cuda/bin \
|
|
// RUN: %clang -v --target=i386-unknown-linux --sysroot=%S/no-cuda-there \
|
|
diff --git a/clang/test/Driver/hipspv-toolchain.hip b/clang/test/Driver/hipspv-toolchain.hip
|
|
index b2187acbcd..3c175ebf43 100644
|
|
--- a/clang/test/Driver/hipspv-toolchain.hip
|
|
+++ b/clang/test/Driver/hipspv-toolchain.hip
|
|
@@ -1,4 +1,4 @@
|
|
-// UNSUPPORTED: system-windows
|
|
+// UNSUPPORTED: system-windows, system-cygwin
|
|
|
|
// RUN: %clang -### -target x86_64-linux-gnu --offload=spirv64 \
|
|
// RUN: --no-offload-new-driver --hip-path=%S/Inputs/hipspv -nohipwrapperinc %s \
|
|
diff --git a/clang/test/Driver/ld-path.c b/clang/test/Driver/ld-path.c
|
|
index bc10b9e12e..e00b63d4ef 100644
|
|
--- a/clang/test/Driver/ld-path.c
|
|
+++ b/clang/test/Driver/ld-path.c
|
|
@@ -1,5 +1,5 @@
|
|
/// This tests uses the PATH environment variable.
|
|
-// UNSUPPORTED: system-windows
|
|
+// UNSUPPORTED: system-windows, system-cygwin
|
|
|
|
// RUN: cd %S
|
|
|
|
diff --git a/clang/test/Driver/program-path-priority.c b/clang/test/Driver/program-path-priority.c
|
|
index c940c4ced9..b88c0f29f7 100644
|
|
--- a/clang/test/Driver/program-path-priority.c
|
|
+++ b/clang/test/Driver/program-path-priority.c
|
|
@@ -1,5 +1,5 @@
|
|
/// Don't create symlinks on Windows
|
|
-// UNSUPPORTED: system-windows
|
|
+// UNSUPPORTED: system-windows, system-cygwin
|
|
|
|
/// Check the priority used when searching for tools
|
|
/// Names and locations are usually in this order:
|
|
diff --git a/clang/test/Driver/spirv-toolchain.cl b/clang/test/Driver/spirv-toolchain.cl
|
|
index 53e8455e3d..54c794c77e 100644
|
|
--- a/clang/test/Driver/spirv-toolchain.cl
|
|
+++ b/clang/test/Driver/spirv-toolchain.cl
|
|
@@ -92,7 +92,7 @@
|
|
// RUN: mkdir -p %t/versioned
|
|
// RUN: touch %t/versioned/spirv-as-%llvm-version-major \
|
|
// RUN: && chmod +x %t/versioned/spirv-as-%llvm-version-major
|
|
-// RUN: %if !system-windows %{ env "PATH=%t/versioned" %clang -### --target=spirv64 -x cl -c --save-temps %s 2>&1 \
|
|
+// RUN: %if !system-windows && !system-cygwin %{ env "PATH=%t/versioned" %clang -### --target=spirv64 -x cl -c --save-temps %s 2>&1 \
|
|
// RUN: | FileCheck -DVERSION=%llvm-version-major --check-prefix=VERSIONED %s %}
|
|
|
|
// VERSIONED: {{.*}}spirv-as-[[VERSION]]
|
|
diff --git a/clang/test/Interpreter/simple-exception.cpp b/clang/test/Interpreter/simple-exception.cpp
|
|
index 651e8d9402..8f7b515c14 100644
|
|
--- a/clang/test/Interpreter/simple-exception.cpp
|
|
+++ b/clang/test/Interpreter/simple-exception.cpp
|
|
@@ -1,7 +1,7 @@
|
|
// clang-format off
|
|
// UNSUPPORTED: system-aix
|
|
// XFAIL for arm, or running on Windows.
|
|
-// XFAIL: target=arm-{{.*}}, target=armv{{.*}}, system-windows
|
|
+// XFAIL: target=arm-{{.*}}, target=armv{{.*}}, system-windows, system-cygwin
|
|
// RUN: cat %s | clang-repl | FileCheck %s
|
|
|
|
// Incompatible with msan. It passes with -O3 but fail -Oz. Interpreter
|
|
diff --git a/clang/test/Lexer/cross-windows-on-linux.cpp b/clang/test/Lexer/cross-windows-on-linux.cpp
|
|
index 3932ffcb33..ece16b1ac8 100644
|
|
--- a/clang/test/Lexer/cross-windows-on-linux.cpp
|
|
+++ b/clang/test/Lexer/cross-windows-on-linux.cpp
|
|
@@ -10,4 +10,4 @@
|
|
// on non-Windows unless -fms-extensions is passed. It won't fail in this way on
|
|
// Windows because the filesystem will interpret the backslash as a directory
|
|
// separator.
|
|
-// UNSUPPORTED: system-windows
|
|
+// UNSUPPORTED: system-windows, system-cygwin
|
|
diff --git a/clang/test/Modules/pr97313.cppm b/clang/test/Modules/pr97313.cppm
|
|
index 32c7112da0..99795d6e43 100644
|
|
--- a/clang/test/Modules/pr97313.cppm
|
|
+++ b/clang/test/Modules/pr97313.cppm
|
|
@@ -1,4 +1,4 @@
|
|
-// REQUIRES: !system-windows
|
|
+// REQUIRES: !system-windows, !system-cygwin
|
|
//
|
|
// RUN: rm -rf %t
|
|
// RUN: mkdir -p %t
|
|
diff --git a/clang/test/Preprocessor/file_test.c b/clang/test/Preprocessor/file_test.c
|
|
index 945882ded7..1e7e1dfe96 100644
|
|
--- a/clang/test/Preprocessor/file_test.c
|
|
+++ b/clang/test/Preprocessor/file_test.c
|
|
@@ -1,4 +1,4 @@
|
|
-// UNSUPPORTED: system-windows
|
|
+// UNSUPPORTED: system-windows, system-cygwin
|
|
// RUN: %clang -E -ffile-prefix-map=%p=/UNLIKELY_PATH/empty -c -o - %s | FileCheck %s
|
|
// RUN: %clang -E -fmacro-prefix-map=%p=/UNLIKELY_PATH/empty -c -o - %s | FileCheck %s
|
|
// RUN: %clang -E -fmacro-prefix-map=%p=/UNLIKELY_PATH=empty -c -o - %s | FileCheck %s -check-prefix CHECK-EVIL
|
|
--
|
|
2.51.0.windows.1
|
|
|