diff options
Diffstat (limited to 'meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch')
-rw-r--r-- | meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch b/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch deleted file mode 100644 index c5c18ead74..0000000000 --- a/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | From aa84835a00bfd65e784d58411e76f60658e939dc Mon Sep 17 00:00:00 2001 | ||
2 | From: Oleksandr Popovych <oleksandr.s.popovych@globallogic.com> | ||
3 | Date: Tue, 18 Feb 2020 19:04:55 +0200 | ||
4 | Subject: [PATCH] Add output of tests result | ||
5 | |||
6 | Added console output of testing results in form 'RESULT: TEST_NAME'. | ||
7 | |||
8 | Changed verbose mode of test application set by '-v' ('--verbose') | ||
9 | argument to CK_NORMAL. | ||
10 | Added new supported argument '-vv' ('--extra-verbose') that changes | ||
11 | verbose mode of test application to CK_VERBOSE. Results of each test | ||
12 | are shown in output only if this mode is set. | ||
13 | |||
14 | Upstream-Status: Denied | ||
15 | |||
16 | This patch changes potentially deprecated feature that shoud be changed | ||
17 | in upstream. [https://github.com/libexpat/libexpat/issues/382] | ||
18 | |||
19 | Signed-off-by: Oleksandr Popovych <oleksandr.s.popovych@globallogic.com> | ||
20 | --- | ||
21 | tests/minicheck.c | 10 +++++++++- | ||
22 | tests/runtests.c | 4 +++- | ||
23 | 2 files changed, 12 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/expat/tests/minicheck.c b/expat/tests/minicheck.c | ||
26 | index a5a1efb..94fa412 100644 | ||
27 | --- a/tests/minicheck.c | ||
28 | +++ b/tests/minicheck.c | ||
29 | @@ -164,6 +164,8 @@ srunner_run_all(SRunner *runner, int verbosity) { | ||
30 | if (tc->setup != NULL) { | ||
31 | /* setup */ | ||
32 | if (setjmp(env)) { | ||
33 | + if (verbosity >= CK_VERBOSE) | ||
34 | + printf("SKIP: %s\n", _check_current_function); | ||
35 | add_failure(runner, verbosity); | ||
36 | continue; | ||
37 | } | ||
38 | @@ -171,6 +173,8 @@ srunner_run_all(SRunner *runner, int verbosity) { | ||
39 | } | ||
40 | /* test */ | ||
41 | if (setjmp(env)) { | ||
42 | + if (verbosity >= CK_VERBOSE) | ||
43 | + printf("FAIL: %s\n", _check_current_function); | ||
44 | add_failure(runner, verbosity); | ||
45 | continue; | ||
46 | } | ||
47 | @@ -178,12 +182,16 @@ srunner_run_all(SRunner *runner, int verbosity) { | ||
48 | |||
49 | /* teardown */ | ||
50 | if (tc->teardown != NULL) { | ||
51 | - if (setjmp(env)) { | ||
52 | + if (setjmp(env)) { | ||
53 | + if (verbosity >= CK_VERBOSE) | ||
54 | + printf("PASS: %s\n", _check_current_function); | ||
55 | add_failure(runner, verbosity); | ||
56 | continue; | ||
57 | } | ||
58 | tc->teardown(); | ||
59 | } | ||
60 | + if (verbosity >= CK_VERBOSE) | ||
61 | + printf("PASS: %s\n", _check_current_function); | ||
62 | } | ||
63 | tc = tc->next_tcase; | ||
64 | } | ||
65 | diff --git a/tests/runtests.c b/expat/tests/runtests.c | ||
66 | index 7791fe0..75724e5 100644 | ||
67 | --- a/tests/runtests.c | ||
68 | +++ b/tests/runtests.c | ||
69 | @@ -11619,9 +11619,11 @@ main(int argc, char *argv[]) { | ||
70 | for (i = 1; i < argc; ++i) { | ||
71 | char *opt = argv[i]; | ||
72 | if (strcmp(opt, "-v") == 0 || strcmp(opt, "--verbose") == 0) | ||
73 | - verbosity = CK_VERBOSE; | ||
74 | + verbosity = CK_NORMAL; | ||
75 | else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0) | ||
76 | verbosity = CK_SILENT; | ||
77 | + else if (strcmp(opt, "-vv") == 0 || strcmp(opt, "--extra-verbose") == 0) | ||
78 | + verbosity = CK_VERBOSE; | ||
79 | else { | ||
80 | fprintf(stderr, "runtests: unknown option '%s'\n", opt); | ||
81 | return 2; | ||
82 | -- | ||
83 | 2.17.1 | ||