diff --git a/compiler/cunit/cunit-3.2.6-aros.diff b/compiler/cunit/cunit-3.2.6-aros.diff index c7bc4c04e6..64c63f9344 100644 --- a/compiler/cunit/cunit-3.2.6-aros.diff +++ b/compiler/cunit/cunit-3.2.6-aros.diff @@ -1,6 +1,6 @@ diff -ruN cunit-3.2.6/CUnit/CMakeLists.txt cunit-3.2.6.aros/CUnit/CMakeLists.txt --- cunit-3.2.6/CUnit/CMakeLists.txt 2020-04-16 17:55:15.000000000 +0000 -+++ cunit-3.2.6.aros/CUnit/CMakeLists.txt 2021-01-05 04:24:52.950000000 +0000 ++++ cunit-3.2.6.aros/CUnit/CMakeLists.txt 2020-04-16 17:55:15.000000000 +0000 @@ -11,7 +11,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") @@ -10,6 +10,80 @@ diff -ruN cunit-3.2.6/CUnit/CMakeLists.txt cunit-3.2.6.aros/CUnit/CMakeLists.txt endif() +diff -ruN cunit-3.2.6/CUnit/Sources/Automated/AutomatedJUnitXml.c cunit-3.2.6.aros/CUnit/Sources/Automated/AutomatedJUnitXml.c +--- cunit-3.2.6/CUnit/Sources/Automated/AutomatedJUnitXml.c 2020-04-16 17:55:15.000000000 +0000 ++++ cunit-3.2.6.aros/CUnit/Sources/Automated/AutomatedJUnitXml.c 2021-01-11 16:47:21.700000000 +0000 +@@ -177,13 +177,14 @@ + return n; + } + +-static void format_testcase(cu_dstr *dst, const char *esc_name, CU_pSuite suite, CU_pTest test) { ++static void format_testcase(cu_dstr *dst, unsigned int testno, const char *esc_name, CU_pSuite suite, CU_pTest test) { + char *esc_test_name = _escape_string(test->pName); + CU_pFailureRecord failure = NULL; + _dstr_putf(dst, +- " \n", ++ " \n", + CU_automated_package_name_get(), + esc_name, ++ testno, + esc_test_name, + CU_get_test_duration(test) + ); +@@ -269,13 +270,14 @@ + int all_tests = CU_count_all_tests(registry) + count_all_init_funcs(registry); + + _dstr_init(&dst); +- _dstr_puts(&dst, "\n"); ++ _dstr_puts(&dst, "\n"); + _dstr_putf(&dst, +- "\n", ++ "\n", ++ CU_automated_package_name_get(), ++ esc_name, + all_errors, + all_failures, + all_tests, +- esc_name, + summary->ElapsedTime + ); + free(esc_name); +@@ -286,27 +288,30 @@ + int errors = count_suite_init_errors(suite); + int test_count = CU_count_suite_tests(suite) + count_suite_init_funcs(suite); + int test_failures = errors + CU_count_suite_failures(suite); ++ unsigned int testno = 0; + esc_name = _escape_string(suite->pName); + _dstr_putf(&dst, +- " \n", ++ " \n", ++ CU_automated_package_name_get(), ++ esc_name, ++ suite->pName, + errors, + test_failures, + test_count, +- suite->pName, + CU_get_suite_duration(suite) + ); + + /* record suite setup */ +- if (suite->pInitializeFuncTest) format_testcase(&dst, esc_name, suite, suite->pInitializeFuncTest); ++ if (suite->pInitializeFuncTest) format_testcase(&dst, testno++, esc_name, suite, suite->pInitializeFuncTest); + + /* iterate through all the tests */ + while (test) { +- format_testcase(&dst, esc_name, suite, test); ++ format_testcase(&dst, testno++, esc_name, suite, test); + test = test->pNext; + } + + /* record suite cleanup */ +- if (suite->pCleanupFuncTest) format_testcase(&dst, esc_name, suite, suite->pCleanupFuncTest); ++ if (suite->pCleanupFuncTest) format_testcase(&dst, testno++, esc_name, suite, suite->pCleanupFuncTest); + + _dstr_puts(&dst, " \n"); + free(esc_name); diff -ruN cunit-3.2.6/CUnit/Sources/Framework/TestRun.c cunit-3.2.6.aros/CUnit/Sources/Framework/TestRun.c --- cunit-3.2.6/CUnit/Sources/Framework/TestRun.c 2020-04-16 17:55:15.000000000 +0000 +++ cunit-3.2.6.aros/CUnit/Sources/Framework/TestRun.c 2020-04-16 17:55:15.000000000 +0000 diff --git a/developer/debug/test/crt/stdc/cunit-crt-fileseek.c b/developer/debug/test/crt/stdc/cunit-crt-fileseek.c index 027b6da8b4..68c47da1ab 100644 --- a/developer/debug/test/crt/stdc/cunit-crt-fileseek.c +++ b/developer/debug/test/crt/stdc/cunit-crt-fileseek.c @@ -109,7 +109,7 @@ int main(void) return CU_get_error(); /* add a suite to the registry */ - pSuite = CU_add_suite("CRTFileSeek_Suite", init_suite, clean_suite); + pSuite = CU_add_suite("FileSeek_Suite", init_suite, clean_suite); if (NULL == pSuite) { CU_cleanup_registry(); return CU_get_error(); @@ -132,6 +132,7 @@ int main(void) CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_run_tests(); CU_basic_set_mode(CU_BRM_SILENT); + CU_automated_package_name_set("CRTUnitTests"); CU_set_output_filename("CRT-FileSeek"); CU_automated_enable_junit_xml(CU_TRUE); CU_automated_run_tests(); diff --git a/developer/debug/test/crt/stdc/cunit-crt-types.c b/developer/debug/test/crt/stdc/cunit-crt-types.c index 8919144bd0..6653caefd8 100644 --- a/developer/debug/test/crt/stdc/cunit-crt-types.c +++ b/developer/debug/test/crt/stdc/cunit-crt-types.c @@ -103,7 +103,7 @@ int main(void) return CU_get_error(); /* add a suite to the registry */ - pSuite = CU_add_suite("CRTStandardTypes_Suite", init_suite, clean_suite); + pSuite = CU_add_suite("StandardTypes_Suite", init_suite, clean_suite); if (NULL == pSuite) { CU_cleanup_registry(); return CU_get_error(); @@ -127,6 +127,7 @@ int main(void) CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_run_tests(); CU_basic_set_mode(CU_BRM_SILENT); + CU_automated_package_name_set("CRTUnitTests"); CU_set_output_filename("CRT-Types"); CU_automated_enable_junit_xml(CU_TRUE); CU_automated_run_tests(); diff --git a/developer/debug/test/dos/cunit-dos-fileseek.c b/developer/debug/test/dos/cunit-dos-fileseek.c index ca3825464b..d63eb654f5 100644 --- a/developer/debug/test/dos/cunit-dos-fileseek.c +++ b/developer/debug/test/dos/cunit-dos-fileseek.c @@ -110,7 +110,7 @@ int main(void) return CU_get_error(); /* add a suite to the registry */ - pSuite = CU_add_suite("DOSFileSeek_Suite", init_suite, clean_suite); + pSuite = CU_add_suite("FileSeek_Suite", init_suite, clean_suite); if (NULL == pSuite) { CU_cleanup_registry(); return CU_get_error(); @@ -132,6 +132,7 @@ int main(void) CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_run_tests(); CU_basic_set_mode(CU_BRM_SILENT); + CU_automated_package_name_set("DOSUnitTests"); CU_set_output_filename("DOS-FileSeek"); CU_automated_enable_junit_xml(CU_TRUE); CU_automated_run_tests(); diff --git a/developer/debug/test/exec/cunit-exec-types.c b/developer/debug/test/exec/cunit-exec-types.c index 9088f79df8..d3d546d139 100644 --- a/developer/debug/test/exec/cunit-exec-types.c +++ b/developer/debug/test/exec/cunit-exec-types.c @@ -78,7 +78,7 @@ int main(void) return CU_get_error(); /* add a suite to the registry */ - pSuite = CU_add_suite("ExecTypes_Suite", init_suite, clean_suite); + pSuite = CU_add_suite("BasicTypes_Suite", init_suite, clean_suite); if (NULL == pSuite) { CU_cleanup_registry(); return CU_get_error(); @@ -100,6 +100,7 @@ int main(void) CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_run_tests(); CU_basic_set_mode(CU_BRM_SILENT); + CU_automated_package_name_set("ExecUnitTests"); CU_set_output_filename("Exec-Types"); CU_automated_enable_junit_xml(CU_TRUE); CU_automated_run_tests(); diff --git a/developer/debug/test/hidds/gfx/cunit-convertpixels.c b/developer/debug/test/hidds/gfx/cunit-convertpixels.c index 00c351392f..80e3fe978c 100644 --- a/developer/debug/test/hidds/gfx/cunit-convertpixels.c +++ b/developer/debug/test/hidds/gfx/cunit-convertpixels.c @@ -193,7 +193,8 @@ int main(void) CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_run_tests(); CU_basic_set_mode(CU_BRM_SILENT); - CU_set_output_filename("Gfx-ConvertPixels"); + CU_automated_package_name_set("GfxHiddUnitTests"); + CU_set_output_filename("GfxHidd-ConvertPixels"); CU_automated_enable_junit_xml(CU_TRUE); CU_automated_run_tests(); CU_cleanup_registry();