diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-06-21 13:59:01 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-06-21 13:59:01 +0000 |
| commit | 3a0822f094b578157263e04114075ad7df81db41 (patch) | |
| tree | bc48361fe2cd1ca5f93ac01b38b183774468fc79 /utils/lit/tests | |
| parent | 85d8b2bbe386bcfe669575d05b61482d7be07e5d (diff) | |
Diffstat (limited to 'utils/lit/tests')
| -rwxr-xr-x | utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest | 2 | ||||
| -rw-r--r-- | utils/lit/tests/discovery.py | 4 | ||||
| -rw-r--r-- | utils/lit/tests/unittest-adaptor.py | 4 | ||||
| -rw-r--r-- | utils/lit/tests/xunit-output.py | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest b/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest index 9dff137f4dec..dd49f025b1f2 100755 --- a/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest +++ b/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest @@ -21,6 +21,7 @@ elif not sys.argv[1].startswith("--gtest_filter="): test_name = sys.argv[1].split('=',1)[1] if test_name == 'FirstTest.subTestA': print('I am subTest A, I PASS') + print('[ PASSED ] 1 test.') sys.exit(0) elif test_name == 'FirstTest.subTestB': print('I am subTest B, I FAIL') @@ -29,6 +30,7 @@ elif test_name == 'FirstTest.subTestB': elif test_name in ('ParameterizedTest/0.subTest', 'ParameterizedTest/1.subTest'): print('I am a parameterized test, I also PASS') + print('[ PASSED ] 1 test.') sys.exit(0) else: raise SystemExit("error: invalid test name: %r" % (test_name,)) diff --git a/utils/lit/tests/discovery.py b/utils/lit/tests/discovery.py index 28010894cda6..60f67dcd740e 100644 --- a/utils/lit/tests/discovery.py +++ b/utils/lit/tests/discovery.py @@ -7,8 +7,8 @@ # RUN: FileCheck --check-prefix=CHECK-BASIC-ERR < %t.err %s # # CHECK-BASIC-ERR: loading suite config '{{.*}}/discovery/lit.cfg' -# CHECK-BASIC-ERR: loading local config '{{.*}}/discovery/subdir/lit.local.cfg' # CHECK-BASIC-ERR: loading suite config '{{.*}}/discovery/subsuite/lit.cfg' +# CHECK-BASIC-ERR: loading local config '{{.*}}/discovery/subdir/lit.local.cfg' # # CHECK-BASIC-OUT: -- Test Suites -- # CHECK-BASIC-OUT: sub-suite - 2 tests @@ -51,8 +51,8 @@ # CHECK-ASEXEC-ERR: load_config from '{{.*}}/discovery/lit.cfg' # CHECK-ASEXEC-ERR: loaded config '{{.*}}/discovery/lit.cfg' # CHECK-ASEXEC-ERR: loaded config '{{.*}}/exec-discovery/lit.site.cfg' -# CHECK-ASEXEC-ERR: loading local config '{{.*}}/discovery/subdir/lit.local.cfg' # CHECK-ASEXEC-ERR: loading suite config '{{.*}}/discovery/subsuite/lit.cfg' +# CHECK-ASEXEC-ERR: loading local config '{{.*}}/discovery/subdir/lit.local.cfg' # # CHECK-ASEXEC-OUT: -- Test Suites -- # CHECK-ASEXEC-OUT: sub-suite - 2 tests diff --git a/utils/lit/tests/unittest-adaptor.py b/utils/lit/tests/unittest-adaptor.py index 7435dda41968..0848cd22baae 100644 --- a/utils/lit/tests/unittest-adaptor.py +++ b/utils/lit/tests/unittest-adaptor.py @@ -3,8 +3,8 @@ # RUN: %{python} %s %{inputs}/unittest-adaptor 2> %t.err # RUN: FileCheck < %t.err %s # -# CHECK: unittest-adaptor :: test-one.txt ... ok -# CHECK: unittest-adaptor :: test-two.txt ... FAIL +# CHECK-DAG: unittest-adaptor :: test-two.txt ... FAIL +# CHECK-DAG: unittest-adaptor :: test-one.txt ... ok import unittest import sys diff --git a/utils/lit/tests/xunit-output.py b/utils/lit/tests/xunit-output.py index 87652290f47d..3f4939536379 100644 --- a/utils/lit/tests/xunit-output.py +++ b/utils/lit/tests/xunit-output.py @@ -5,6 +5,6 @@ # CHECK: <?xml version="1.0" encoding="UTF-8" ?> # CHECK: <testsuites> # CHECK: <testsuite name='test-data' tests='1' failures='0'> -# CHECK: <testcase classname='test-data.' name='metrics.ini' time='0.00'/> +# CHECK: <testcase classname='test-data.test-data' name='metrics.ini' time='0.{{[0-9]+}}'/> # CHECK: </testsuite> -# CHECK: </testsuites>
\ No newline at end of file +# CHECK: </testsuites> |