Make ICU ptest output compatible with Automake format

Update ICU ptest output so that each test prints in the Automake "simple
test" format required by Yocto[1]:

  result: testname

Where `result` is one of PASS, FAIL, or SKIP.

[1] https://wiki.yoctoproject.org/wiki/Ptest

Signed-off-by: Jiaying Song <[email protected]>

Author: jiajia123-wind

icu4c/source/configure.ac

@@ -1103,6 +1103,25 @@ If set, it will REPLACE any automatic list of libraries.],
 		*) AC_MSG_ERROR(bad value ${enableval} for --enable-samples) ;;
 		esac],
 	samples=true)
+
+# Enable Automake-compatible ptest output format (for Yocto/OpenEmbedded)
+AC_ARG_ENABLE([ptest-automake-format],
+    AS_HELP_STRING([--enable-ptest-automake-format],
+                   [Emit ptest output in Automake format (PASS:/FAIL:) for Yocto ptest]),
+    [
+        if test "x$enableval" = "xyes"; then
+            U_PTEST_AUTOMAKE_FORMAT_DEFS="-DU_PTEST_AUTOMAKE_FORMAT=1"
+            AC_MSG_RESULT([enabling Automake ptest format])
+        else
+            U_PTEST_AUTOMAKE_FORMAT_DEFS=""
+            AC_MSG_RESULT([disabling Automake ptest format])
+        fi
+    ],
+    [enable_ptest_automake_format=no
+     U_PTEST_AUTOMAKE_FORMAT_DEFS=""])
+
+AC_SUBST(U_PTEST_AUTOMAKE_FORMAT_DEFS)
+
 ICU_CONDITIONAL(SAMPLES, test "$samples" = true)
 
 ICUDATA_CHAR=$U_ENDIAN_CHAR
@@ -1366,3 +1385,5 @@ then
 fi
 
 $as_unset _CXX_CXXSUFFIX
+
+

icu4c/source/icudefs.mk.in

@@ -130,7 +130,7 @@ SED = @SED@
 # configure prevents user defined DEFS, and configure's DEFS is not needed
 # So we ignore the DEFS that comes from configure
 # U_ATTRIBUTE_DEPRECATED is defined to hide warnings about deprecated API warnings.
-DEFS = -DU_ALL_IMPLEMENTATION -DU_ATTRIBUTE_DEPRECATED=
+DEFS = -DU_ALL_IMPLEMENTATION -DU_ATTRIBUTE_DEPRECATED= @U_PTEST_AUTOMAKE_FORMAT_DEFS@
 # CFLAGS is for C only flags
 CFLAGS = @CFLAGS@
 # CXXFLAGS is for C++ only flags

icu4c/source/test/intltest/intltest.cpp

@@ -824,11 +824,19 @@ UBool IntlTest::runTestLoop( char* testname, char* par, char *baseName )
             saveBaseLoc[0]=0; /* reset path */
 
             if (lastErrorCount == errorCount) {
-                snprintf( msg, sizeof(msg),  "   } OK:   %s ", name );
+            #ifdef U_PTEST_AUTOMAKE_FORMAT
+                snprintf(msg, sizeof(msg), "PASS: %s\n   }", name);
+            #else
+                snprintf(msg, sizeof(msg),  "   } OK:   %s ", name );
+            #endif
                 if(!no_time) str_timeDelta(msg+strlen(msg),timeStop-timeStart);
                 lastTestFailed = false;
             }else{
+            #ifdef U_PTEST_AUTOMAKE_FORMAT
+                snprintf(msg, sizeof(msg), "FAIL: %s\n   } (ERRORS: %li)", name, static_cast<long>(errorCount - lastErrorCount));
+            #else
                 snprintf(msg, sizeof(msg), "   } ERRORS (%li) in %s", static_cast<long>(errorCount - lastErrorCount), name);
+            #endif
                 if(!no_time) str_timeDelta(msg+strlen(msg),timeStop-timeStart);
 
                 for(int i=0;i<LL_indentlevel;i++) {

icu4c/source/tools/ctestfw/ctest.c

@@ -413,9 +413,16 @@ static void iterateTestsWithLevel ( const TestNode* root,
         ctest_xml_testcase(pathToFunction, pathToFunction, timeSeconds, (myERROR_COUNT!=ERROR_COUNT)?"error":NULL);
 
         if (myERROR_COUNT != ERROR_COUNT) {
-          log_testinfo_i("} ---[%d ERRORS in %s] ", ERROR_COUNT - myERROR_COUNT, pathToFunction);
+        #ifdef U_PTEST_AUTOMAKE_FORMAT
+          log_testinfo_i("\nFAIL: %s\n} ---[ERRORS: %d]", root->name,ERROR_COUNT - myERROR_COUNT);
+        #else
+          log_testinfo_i("} ---[%d ERRORS in %s] ", ERROR_COUNT - myERROR_COUNT,pathToFunction);
+        #endif
           strcpy(ERROR_LOG[ERRONEOUS_FUNCTION_COUNT++], pathToFunction);
         } else {
+        #ifdef U_PTEST_AUTOMAKE_FORMAT
+          log_testinfo_i("\nPASS: %s\n", root->name);
+        #endif
           if(!ON_LINE) { /* had some output */
             int spaces = FLAG_INDENT-(depth-1);
             log_testinfo_i("} %*s[OK] ", spaces, "---");