diff options
| author | Reid Kleckner <rnk@google.com> | 2016-03-30 20:15:50 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2016-03-30 20:15:50 +0000 |
| commit | 750e76d24561f833c9329a22b2de98b81c3f4724 (patch) | |
| tree | 965086cf8322c279f137a7ee8af21f91190c48f8 | |
| parent | 4f88914c5be106028d1b64068ba3bef6b47b430c (diff) | |
| download | bcm5719-llvm-750e76d24561f833c9329a22b2de98b81c3f4724.tar.gz bcm5719-llvm-750e76d24561f833c9329a22b2de98b81c3f4724.zip | |
Fix the detection of the shell feature and disable some tests when its not present
llvm-svn: 264912
| -rw-r--r-- | lld/test/ELF/linkerscript.s | 6 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript2.s | 6 | ||||
| -rw-r--r-- | lld/test/lit.cfg | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/lld/test/ELF/linkerscript.s b/lld/test/ELF/linkerscript.s index 9c1bbf68460..76e43677f18 100644 --- 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 70da04b6e41..6ecd9e7ea97 100644 --- 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 54f08f4da2e..5a994e13045 100644 --- 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 |
