Fix the detection of the shell feature and disable some tests when its not present

llvm-svn: 264912

diff --git a/lld/test/ELF/linkerscript.s b/lld/test/ELF/linkerscript.s
index 9c1bbf6..76e4367 100644 (file)
--- a/lld/test/ELF/linkerscript.s
+++ b/lld/test/ELF/linkerscript.s
@@ -1,3 +1,9 @@
+# There is some bad quoting interaction between lit's internal shell, which is
+# implemented in Python, and the Cygwin implementations of the Unix utilities.
+# Avoid running these tests on Windows for now by requiring a real shell.
+
+# REQUIRES: shell
+
 # REQUIRES: x86
 # RUN: mkdir -p %t.dir
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t

diff --git a/lld/test/ELF/linkerscript2.s b/lld/test/ELF/linkerscript2.s
index 70da04b..6ecd9e7 100644 (file)
--- a/lld/test/ELF/linkerscript2.s
+++ b/lld/test/ELF/linkerscript2.s
@@ -1,3 +1,9 @@
+# There is some bad quoting interaction between lit's internal shell, which is
+# implemented in Python, and the Cygwin implementations of the Unix utilities.
+# Avoid running these tests on Windows for now by requiring a real shell.
+
+# REQUIRES: shell
+
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd \

diff --git a/lld/test/lit.cfg b/lld/test/lit.cfg
index 54f08f4..5a994e1 100644 (file)
--- a/lld/test/lit.cfg
+++ b/lld/test/lit.cfg
@@ -188,7 +188,7 @@ if lit_config.useValgrind:
     config.target_triple += '-vg'
 
 # Shell execution
-if platform.system() not in ['Windows'] or lit_config.getBashPath() != '':
+if execute_external:
     config.available_features.add('shell')
 
 # Running on Darwin OS