From 2111b5758f2d542bb0e051e1a11d0df260beb07a Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sat, 13 Jun 2015 06:55:44 +0000 Subject: [PATCH] [LIT] Fix failing LIT tests Summary: I spend some time trying to get the LIT test suite passing. Here are the changes that I needed to make on my machine. I made the following changes for the following reasons. 1. google-test.py: The Google test format now checks for "[ PASSED ] 1 test." to check if a test passes. 2. discovery.py: The output appears in a different order on my machine than it did in the test. 3. unittest-adaptor.py: The output appears in a different order on my machine than it did in the test. 4. The classname is now formed differently in `getJUnitXML(...)`. I'm not sure what is causing the output order to differ in discovery.py and unittest-adaptor.py. Does anybody have any thoughts? Reviewers: ddunbar, danalbert, jroelofs Reviewed By: jroelofs Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D9864 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239663 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest | 2 ++ utils/lit/tests/discovery.py | 4 ++-- utils/lit/tests/unittest-adaptor.py | 4 ++-- 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 9dff137f4de..dd49f025b1f 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 28010894cda..60f67dcd740 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 7435dda4196..0848cd22baa 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 87652290f47..3f493953637 100644 --- a/utils/lit/tests/xunit-output.py +++ b/utils/lit/tests/xunit-output.py @@ -5,6 +5,6 @@ # CHECK: # CHECK: # CHECK: -# CHECK: +# CHECK: # CHECK: -# CHECK: \ No newline at end of file +# CHECK: -- 2.34.1