diff options
| author | Jiaying Song <jiaying.song.cn@windriver.com> | 2025-11-03 15:43:54 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-11-07 13:15:35 +0000 |
| commit | af8ad2c4dc1273bda0086625f2cbf90f4fe6876c (patch) | |
| tree | d3bcf29a82ac9bd1ffa8bf37244d80f4e30c6cec /meta | |
| parent | 3ae55670e2ecc38ffdf13beea338db79e5d1472e (diff) | |
| download | poky-af8ad2c4dc1273bda0086625f2cbf90f4fe6876c.tar.gz | |
icu: use automake ptest output format
Make ICU ptest output compatible with Automake format.
(From OE-Core rev: 95f61319d75b13ef5f6642ff0727a7b8c7877a50)
Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/icu/icu/0001-Make-ICU-ptest-output-compatible-with-Automake-forma.patch | 52 | ||||
| -rw-r--r-- | meta/recipes-support/icu/icu_77-1.bb | 3 |
2 files changed, 54 insertions, 1 deletions
diff --git a/meta/recipes-support/icu/icu/0001-Make-ICU-ptest-output-compatible-with-Automake-forma.patch b/meta/recipes-support/icu/icu/0001-Make-ICU-ptest-output-compatible-with-Automake-forma.patch new file mode 100644 index 0000000000..b30056a4fe --- /dev/null +++ b/meta/recipes-support/icu/icu/0001-Make-ICU-ptest-output-compatible-with-Automake-forma.patch | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | From f56e295e936c6c6d9c7219ef649697891cd11382 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jiaying Song <jiaying.song.cn@windriver.com> | ||
| 3 | Date: Mon, 3 Nov 2025 11:34:06 +0800 | ||
| 4 | Subject: [PATCH] Make ICU ptest output compatible with Automake format | ||
| 5 | |||
| 6 | Change test result format to PASS/FAIL for Automake compatibility | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [oe-specific] | ||
| 9 | |||
| 10 | Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> | ||
| 11 | --- | ||
| 12 | test/intltest/intltest.cpp | 4 ++-- | ||
| 13 | tools/ctestfw/ctest.c | 3 ++- | ||
| 14 | 2 files changed, 4 insertions(+), 3 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/test/intltest/intltest.cpp b/test/intltest/intltest.cpp | ||
| 17 | index 33829b0..07071ea 100644 | ||
| 18 | --- a/test/intltest/intltest.cpp | ||
| 19 | +++ b/test/intltest/intltest.cpp | ||
| 20 | @@ -830,11 +830,11 @@ UBool IntlTest::runTestLoop( char* testname, char* par, char *baseName ) | ||
| 21 | saveBaseLoc[0]=0; /* reset path */ | ||
| 22 | |||
| 23 | if (lastErrorCount == errorCount) { | ||
| 24 | - snprintf( msg, sizeof(msg), " } OK: %s ", name ); | ||
| 25 | + snprintf(msg, sizeof(msg), "PASS: %s\n }", name); | ||
| 26 | if(!no_time) str_timeDelta(msg+strlen(msg),timeStop-timeStart); | ||
| 27 | lastTestFailed = false; | ||
| 28 | }else{ | ||
| 29 | - snprintf(msg, sizeof(msg), " } ERRORS (%li) in %s", static_cast<long>(errorCount - lastErrorCount), name); | ||
| 30 | + snprintf(msg, sizeof(msg), "FAIL: %s\n } (ERRORS: %li)", name, static_cast<long>(errorCount - lastErrorCount)); | ||
| 31 | if(!no_time) str_timeDelta(msg+strlen(msg),timeStop-timeStart); | ||
| 32 | |||
| 33 | for(int i=0;i<LL_indentlevel;i++) { | ||
| 34 | diff --git a/tools/ctestfw/ctest.c b/tools/ctestfw/ctest.c | ||
| 35 | index 7634526..727b164 100644 | ||
| 36 | --- a/tools/ctestfw/ctest.c | ||
| 37 | +++ b/tools/ctestfw/ctest.c | ||
| 38 | @@ -413,9 +413,10 @@ static void iterateTestsWithLevel ( const TestNode* root, | ||
| 39 | ctest_xml_testcase(pathToFunction, pathToFunction, timeSeconds, (myERROR_COUNT!=ERROR_COUNT)?"error":NULL); | ||
| 40 | |||
| 41 | if (myERROR_COUNT != ERROR_COUNT) { | ||
| 42 | - log_testinfo_i("} ---[%d ERRORS in %s] ", ERROR_COUNT - myERROR_COUNT, pathToFunction); | ||
| 43 | + log_testinfo_i("\nFAIL: %s\n} ---[ERRORS: %d]", root->name, ERROR_COUNT - myERROR_COUNT); | ||
| 44 | strcpy(ERROR_LOG[ERRONEOUS_FUNCTION_COUNT++], pathToFunction); | ||
| 45 | } else { | ||
| 46 | + log_testinfo_i("\nPASS: %s\n", root->name); | ||
| 47 | if(!ON_LINE) { /* had some output */ | ||
| 48 | int spaces = FLAG_INDENT-(depth-1); | ||
| 49 | log_testinfo_i("} %*s[OK] ", spaces, "---"); | ||
| 50 | -- | ||
| 51 | 2.34.1 | ||
| 52 | |||
diff --git a/meta/recipes-support/icu/icu_77-1.bb b/meta/recipes-support/icu/icu_77-1.bb index fa25b3e7c8..370c14af81 100644 --- a/meta/recipes-support/icu/icu_77-1.bb +++ b/meta/recipes-support/icu/icu_77-1.bb | |||
| @@ -122,7 +122,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ | |||
| 122 | file://0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch \ | 122 | file://0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch \ |
| 123 | file://0001-test-Add-support-ptest.patch \ | 123 | file://0001-test-Add-support-ptest.patch \ |
| 124 | file://run-ptest \ | 124 | file://run-ptest \ |
| 125 | " | 125 | file://0001-Make-ICU-ptest-output-compatible-with-Automake-forma.patch \ |
| 126 | " | ||
| 126 | 127 | ||
| 127 | SRC_URI:append:class-target = "\ | 128 | SRC_URI:append:class-target = "\ |
| 128 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ | 129 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ |
