[lld] r264912 - Fix the detection of the shell feature and disable some tests when its not present

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Wed Mar 30 13:15:50 PDT 2016


Author: rnk
Date: Wed Mar 30 15:15:50 2016
New Revision: 264912

URL: http://llvm.org/viewvc/llvm-project?rev=264912&view=rev
Log:
Fix the detection of the shell feature and disable some tests when its not present

Modified:
    lld/trunk/test/ELF/linkerscript.s
    lld/trunk/test/ELF/linkerscript2.s
    lld/trunk/test/lit.cfg

Modified: lld/trunk/test/ELF/linkerscript.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript.s?rev=264912&r1=264911&r2=264912&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript.s (original)
+++ lld/trunk/test/ELF/linkerscript.s Wed Mar 30 15:15:50 2016
@@ -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

Modified: lld/trunk/test/ELF/linkerscript2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript2.s?rev=264912&r1=264911&r2=264912&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript2.s (original)
+++ lld/trunk/test/ELF/linkerscript2.s Wed Mar 30 15:15:50 2016
@@ -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 \

Modified: lld/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/lit.cfg?rev=264912&r1=264911&r2=264912&view=diff
==============================================================================
--- lld/trunk/test/lit.cfg (original)
+++ lld/trunk/test/lit.cfg Wed Mar 30 15:15:50 2016
@@ -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




More information about the llvm-commits mailing list