diff options
| author | Greg Parker <gparker@apple.com> | 2017-01-24 08:58:20 +0000 |
|---|---|---|
| committer | Greg Parker <gparker@apple.com> | 2017-01-24 08:58:20 +0000 |
| commit | d972882f06865c7ab6d97d6346d01cace016c6ec (patch) | |
| tree | bc1e06590f5044d1b7ae9dfa094b5b7165a661fc /llvm/utils/lit/tests/Inputs/shtest-format | |
| parent | 9f8bb384af234de7901a3335acbf02d6d4591e20 (diff) | |
| download | bcm5719-llvm-d972882f06865c7ab6d97d6346d01cace016c6ec.tar.gz bcm5719-llvm-d972882f06865c7ab6d97d6346d01cace016c6ec.zip | |
Revert "[lit] Allow boolean expressions in REQUIRES and XFAIL and UNSUPPORTED"
This change needs to be better-coordinated with libc++.
llvm-svn: 292900
Diffstat (limited to 'llvm/utils/lit/tests/Inputs/shtest-format')
12 files changed, 7 insertions, 40 deletions
diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/requires-any-missing.txt b/llvm/utils/lit/tests/Inputs/shtest-format/requires-any-missing.txt new file mode 100644 index 00000000000..c977ee90c9e --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/shtest-format/requires-any-missing.txt @@ -0,0 +1,2 @@ +RUN: true +REQUIRES-ANY: a-missing-feature, a-missing-feature-2 diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/requires-any-present.txt b/llvm/utils/lit/tests/Inputs/shtest-format/requires-any-present.txt new file mode 100644 index 00000000000..f3be518b258 --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/shtest-format/requires-any-present.txt @@ -0,0 +1,2 @@ +RUN: true +REQUIRES-ANY: a-missing-feature, a-present-feature diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/requires-any.txt b/llvm/utils/lit/tests/Inputs/shtest-format/requires-any.txt deleted file mode 100644 index 14c8dd55171..00000000000 --- a/llvm/utils/lit/tests/Inputs/shtest-format/requires-any.txt +++ /dev/null @@ -1,3 +0,0 @@ -# REQUIRES-ANY is no longer supported. Test should not run. -REQUIRES-ANY: true, a-present-feature -RUN: false diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/requires-missing.txt b/llvm/utils/lit/tests/Inputs/shtest-format/requires-missing.txt index d643e57edca..9e6648d8b8f 100644 --- a/llvm/utils/lit/tests/Inputs/shtest-format/requires-missing.txt +++ b/llvm/utils/lit/tests/Inputs/shtest-format/requires-missing.txt @@ -1,5 +1,2 @@ -# REQUIRES with a false clause. Test should not run. -REQUIRES: true -REQUIRES: a-missing-feature, true -REQUIRES: true -RUN: false +RUN: true +REQUIRES: a-missing-feature diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/requires-present.txt b/llvm/utils/lit/tests/Inputs/shtest-format/requires-present.txt index 9fcbdca69be..064f7074a76 100644 --- a/llvm/utils/lit/tests/Inputs/shtest-format/requires-present.txt +++ b/llvm/utils/lit/tests/Inputs/shtest-format/requires-present.txt @@ -1,4 +1,2 @@ -# REQUIRES with only true clauses. Test should run. -REQUIRES: a-present-feature, true, !not-true -REQUIRES: true RUN: true +REQUIRES: a-present-feature diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/requires-star.txt b/llvm/utils/lit/tests/Inputs/shtest-format/requires-star.txt deleted file mode 100644 index 5566d8b15b0..00000000000 --- a/llvm/utils/lit/tests/Inputs/shtest-format/requires-star.txt +++ /dev/null @@ -1,3 +0,0 @@ -# '*' only works in XFAIL -REQUIRES: * -RUN: false diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/requires-triple.txt b/llvm/utils/lit/tests/Inputs/shtest-format/requires-triple.txt deleted file mode 100644 index 6470bf40414..00000000000 --- a/llvm/utils/lit/tests/Inputs/shtest-format/requires-triple.txt +++ /dev/null @@ -1,3 +0,0 @@ -# REQUIRES line that uses target triple, which doesn't work. Test should not run -REQUIRES: x86_64 -RUN: false diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/unsupported-expr-false.txt b/llvm/utils/lit/tests/Inputs/shtest-format/unsupported-expr-false.txt deleted file mode 100644 index 00c6160a367..00000000000 --- a/llvm/utils/lit/tests/Inputs/shtest-format/unsupported-expr-false.txt +++ /dev/null @@ -1,9 +0,0 @@ -# UNSUPPORTED with only false clauses. Test should run. -UNSUPPORTED: false -UNSUPPORTED: false, not-true -UNSUPPORTED: false -UNSUPPORTED: still-not-true -UNSUPPORTED: false -UNSUPPORTED: false -UNSUPPORTED: false -RUN: true diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/unsupported-expr-true.txt b/llvm/utils/lit/tests/Inputs/shtest-format/unsupported-expr-true.txt deleted file mode 100644 index f48ba7b2c2d..00000000000 --- a/llvm/utils/lit/tests/Inputs/shtest-format/unsupported-expr-true.txt +++ /dev/null @@ -1,4 +0,0 @@ -# UNSUPPORTED with a true clause. Test should not run. -UNSUPPORTED: false -UNSUPPORTED: false, false, false, _64-unk && a-present-feature, false -RUN: false diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/unsupported-star.txt b/llvm/utils/lit/tests/Inputs/shtest-format/unsupported-star.txt deleted file mode 100644 index 16630207dac..00000000000 --- a/llvm/utils/lit/tests/Inputs/shtest-format/unsupported-star.txt +++ /dev/null @@ -1,3 +0,0 @@ -# '*' only works in XFAIL -UNSUPPORTED: * -RUN: false diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/xfail-expr-false.txt b/llvm/utils/lit/tests/Inputs/shtest-format/xfail-expr-false.txt deleted file mode 100644 index 83b0de1621d..00000000000 --- a/llvm/utils/lit/tests/Inputs/shtest-format/xfail-expr-false.txt +++ /dev/null @@ -1,3 +0,0 @@ -# XFAIL with only false clauses. Test should run. -XFAIL: false, a-missing-feature || ! a-present-feature || ! x86_64, false -RUN: true diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/xfail-expr-true.txt b/llvm/utils/lit/tests/Inputs/shtest-format/xfail-expr-true.txt deleted file mode 100644 index 3c197484897..00000000000 --- a/llvm/utils/lit/tests/Inputs/shtest-format/xfail-expr-true.txt +++ /dev/null @@ -1,4 +0,0 @@ -# XFAIL with a true clause. Test should not run. -XFAIL: false -XFAIL: false, a-present-feature && ! a-missing-feature && x86_64 -RUN: false |
