Skip to content

[test] Skip some tests on Windows only #95205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2024
Merged

Conversation

jayfoad
Copy link
Contributor

@jayfoad jayfoad commented Jun 12, 2024

These tests do not require bash. Skip them because they use features not
available on Windows. This is a follow up to #94595.

These tests do not require bash. Skip them because they use features not
available on Windows. This is a follow up to llvm#94595.
@llvmbot
Copy link
Member

llvmbot commented Jun 12, 2024

@llvm/pr-subscribers-debuginfo

Author: Jay Foad (jayfoad)

Changes

These tests do not require bash. Skip them because they use features not
available on Windows. This is a follow up to #94595.


Full diff: https://github.com/llvm/llvm-project/pull/95205.diff

3 Files Affected:

  • (modified) llvm/test/DebugInfo/symbolize-gnu-debuglink-no-realpath.test (+3-1)
  • (modified) llvm/test/Other/lit-unicode.txt (+2-2)
  • (modified) llvm/test/tools/llvm-rc/windres-prefix.test (+2-1)
diff --git a/llvm/test/DebugInfo/symbolize-gnu-debuglink-no-realpath.test b/llvm/test/DebugInfo/symbolize-gnu-debuglink-no-realpath.test
index 5141ff6ce322c..63c9f82bb0a63 100644
--- a/llvm/test/DebugInfo/symbolize-gnu-debuglink-no-realpath.test
+++ b/llvm/test/DebugInfo/symbolize-gnu-debuglink-no-realpath.test
@@ -1,4 +1,6 @@
-# REQUIRES: shell
+# This test uses symlinks.
+UNSUPPORTED: system-windows
+
 # Ensure that no realpath assumptions are made about .gnu_debuglink paths.
 
 # Copy inputs to some other location with arbitrary names, with the original
diff --git a/llvm/test/Other/lit-unicode.txt b/llvm/test/Other/lit-unicode.txt
index 2f40001451688..d884337d7cb2e 100644
--- a/llvm/test/Other/lit-unicode.txt
+++ b/llvm/test/Other/lit-unicode.txt
@@ -1,5 +1,5 @@
-FIXME: See if we can fix this in lit by using Unicode strings.
-REQUIRES: shell
+Windows echo does not have good Unicode support.
+UNSUPPORTED: system-windows
 
 RUN: echo "ようこそ" | FileCheck %s
 CHECK: {{^}}ようこそ{{$}}
diff --git a/llvm/test/tools/llvm-rc/windres-prefix.test b/llvm/test/tools/llvm-rc/windres-prefix.test
index 4c53fdfc3db65..a907666284704 100644
--- a/llvm/test/tools/llvm-rc/windres-prefix.test
+++ b/llvm/test/tools/llvm-rc/windres-prefix.test
@@ -1,4 +1,5 @@
-; REQUIRES: shell
+; This test uses symlinks.
+; UNSUPPORTED: system-windows
 
 ; RUN: rm -rf %t && mkdir %t
 

Copy link
Collaborator

@zmodem zmodem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Collaborator

@pogo59 pogo59 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jayfoad jayfoad merged commit 35f9e5f into llvm:main Jun 12, 2024
9 checks passed
@jayfoad jayfoad deleted the lit-windows branch June 12, 2024 15:55
FIXME: See if we can fix this in lit by using Unicode strings.
REQUIRES: shell
Windows echo does not have good Unicode support.
UNSUPPORTED: system-windows
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does something like RUN: python3 -c 'print("ようこそ")' | FileCheck %s work?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FTR, the test works fine for me on Windows, unless I force it to use the gnuwin32 echo instead of cmd's echo.

Maybe use printf instead of echo? That worked in my environment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants