diff options
author | Julian Lettner <jlettner@apple.com> | 2019-10-15 20:57:20 +0000 |
---|---|---|
committer | Julian Lettner <jlettner@apple.com> | 2019-10-15 20:57:20 +0000 |
commit | 74b285eee7288500f6041c0fa49413c8ead217f4 (patch) | |
tree | 520aa77659f9ca3a80d2de5b0f23c4d8d8e6ff4f /llvm/utils/lit/tests | |
parent | 34d4bff3d6d7cc521b06679536b0273c00bb0b3b (diff) | |
download | bcm5719-llvm-74b285eee7288500f6041c0fa49413c8ead217f4.tar.gz bcm5719-llvm-74b285eee7288500f6041c0fa49413c8ead217f4.zip |
[lit] Add back LitTestCase
This essentially reverts a commit [1] that removed the adaptor for
Python unittests. The code has been slightly refactored to make it more
additive: all code is contained in LitTestCase.py.
Usage sites will require a small adaption:
```
[old]
import lit.discovery
...
test_suite = lit.discovery.load_test_suite(...)
[new]
import lit.LitTestCase
...
test_suite = lit.LitTestCase.load_test_suite(...)
```
This was put back on request by Daniel Dunbar, since I wrongly assumed
that the functionality is unused. At least llbuild still uses this [2].
[1] 70ca752ccf6a8f362aea25ccd3ee2bbceca93b20
[2] https://github.com/apple/swift-llbuild/blob/master/utils/Xcode/LitXCTestAdaptor/LitTests.py#L16
Reviewed By: ddunbar
Differential Revision: https://reviews.llvm.org/D69002
llvm-svn: 374947
Diffstat (limited to 'llvm/utils/lit/tests')
4 files changed, 25 insertions, 0 deletions
diff --git a/llvm/utils/lit/tests/Inputs/unittest-adaptor/lit.cfg b/llvm/utils/lit/tests/Inputs/unittest-adaptor/lit.cfg new file mode 100644 index 00000000000..9e08a8629a4 --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/unittest-adaptor/lit.cfg @@ -0,0 +1,6 @@ +import lit.formats +config.name = 'unittest-adaptor' +config.suffixes = ['.txt'] +config.test_format = lit.formats.ShTest() +config.test_source_root = None +config.test_exec_root = None diff --git a/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-one.txt b/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-one.txt new file mode 100644 index 00000000000..b80b60b7a27 --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-one.txt @@ -0,0 +1 @@ +# RUN: true diff --git a/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-two.txt b/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-two.txt new file mode 100644 index 00000000000..49932c3006e --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-two.txt @@ -0,0 +1 @@ +# RUN: false diff --git a/llvm/utils/lit/tests/unittest-adaptor.py b/llvm/utils/lit/tests/unittest-adaptor.py new file mode 100644 index 00000000000..ee2eee4572e --- /dev/null +++ b/llvm/utils/lit/tests/unittest-adaptor.py @@ -0,0 +1,17 @@ +# Check the lit adaption to run under unittest. +# +# RUN: %{python} %s %{inputs}/unittest-adaptor 2> %t.err +# RUN: FileCheck < %t.err %s +# +# CHECK-DAG: unittest-adaptor :: test-two.txt ... FAIL +# CHECK-DAG: unittest-adaptor :: test-one.txt ... ok + +import sys +import unittest + +import lit.LitTestCase + +input_path = sys.argv[1] +unittest_suite = lit.LitTestCase.load_test_suite([input_path]) +runner = unittest.TextTestRunner(verbosity=2) +runner.run(unittest_suite) |