diff options
author | Daniel Dunbar <daniel@zuster.org> | 2013-09-14 01:19:17 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2013-09-14 01:19:17 +0000 |
commit | 2849503ab240a2dab6f2e3c5a029e3416165554f (patch) | |
tree | 9c635687635c6bf68c0125d0a1b6e1d62db721a8 /utils/lit/tests | |
parent | e94e0984dfd22ede6211080d1f3e47138f1ea857 (diff) | |
download | llvm-2849503ab240a2dab6f2e3c5a029e3416165554f.tar.gz llvm-2849503ab240a2dab6f2e3c5a029e3416165554f.tar.bz2 llvm-2849503ab240a2dab6f2e3c5a029e3416165554f.tar.xz |
[lit] Add an --output option, for writing results in a machine readable form.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@190738 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/lit/tests')
-rw-r--r-- | utils/lit/tests/Inputs/test-data/metrics.ini | 2 | ||||
-rw-r--r-- | utils/lit/tests/lit.cfg | 6 | ||||
-rw-r--r-- | utils/lit/tests/test-output.py | 21 |
3 files changed, 27 insertions, 2 deletions
diff --git a/utils/lit/tests/Inputs/test-data/metrics.ini b/utils/lit/tests/Inputs/test-data/metrics.ini index 267e516803..01b09c5c77 100644 --- a/utils/lit/tests/Inputs/test-data/metrics.ini +++ b/utils/lit/tests/Inputs/test-data/metrics.ini @@ -1,6 +1,6 @@ [global] result_code = PASS -result_output = 'Test passed.' +result_output = Test passed. [results] value0 = 1 diff --git a/utils/lit/tests/lit.cfg b/utils/lit/tests/lit.cfg index a8d259136e..2111b72748 100644 --- a/utils/lit/tests/lit.cfg +++ b/utils/lit/tests/lit.cfg @@ -23,7 +23,7 @@ config.excludes = ['Inputs'] config.test_source_root = os.path.dirname(__file__) config.test_exec_root = config.test_source_root -config.target_triple = None +config.target_triple = '(unused)' src_root = os.path.join(config.test_source_root, '..') config.environment['PYTHONPATH'] = src_root @@ -39,3 +39,7 @@ config.substitutions.append(('%{python}', sys.executable)) if lit_config.params.get('check-coverage', None): config.environment['COVERAGE_PROCESS_START'] = os.path.join( os.path.dirname(__file__), ".coveragerc") + +# Add a feature to detect the Python version. +config.available_features.add("python%d.%d" % (sys.version_info[0], + sys.version_info[1])) diff --git a/utils/lit/tests/test-output.py b/utils/lit/tests/test-output.py new file mode 100644 index 0000000000..adfbcd88f2 --- /dev/null +++ b/utils/lit/tests/test-output.py @@ -0,0 +1,21 @@ +# XFAIL: python2.5 + +# RUN: %{lit} -j 1 -v %{inputs}/test-data --output %t.results.out > %t.out +# RUN: FileCheck < %t.results.out %s + +# CHECK: { +# CHECK: "__version__" +# CHECK: "elapsed" +# CHECK-NEXT: "tests": [ +# CHECK-NEXT: { +# CHECK-NEXT: "code": "PASS", +# CHECK-NEXT: "elapsed": {{[0-9.]+}}, +# CHECK-NEXT: "metrics": { +# CHECK-NEXT: "value0": 1, +# CHECK-NEXT: "value1": 2.3456 +# CHECK-NEXT: } +# CHECK-NEXT: "name": "test-data :: metrics.ini", +# CHECK-NEXT: "output": "Test passed." +# CHECK-NEXT: } +# CHECK-NEXT: ] +# CHECK-NEXT: } |