From 94fe8cf47a5f29630c0366a04d487da8f60faae4 Mon Sep 17 00:00:00 2001
From: Vincent Yang <yang.vincent.h@icloud.com>
Date: Thu, 11 Dec 2025 20:41:19 +0800
Subject: [PATCH 1/3] Improve test-status output when no tests are skipped or
 failed

---
 build.xml | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index e48c35494d53..35fa58da3af2 100644
--- a/build.xml
+++ b/build.xml
@@ -2061,9 +2061,40 @@
         <contains text="Failures: 0, Errors: 0" />
       </not>
     </fileset>
+
+    <!-- Start Patch 1 -->
+    <resourcecount property="skipped.count">
+      <fileset refid="test.result.skippedtests"/>
+    </resourcecount>
+
+    <resourcecount property="failed.count">
+      <fileset refid="test.result.failedtests"/>
+    </resourcecount>
+
+    <pathconvert property="skipped.list" pathsep=";">
+      <fileset refid="test.result.skippedtests"/>
+    </pathconvert>
+
+    <pathconvert property="failed.list" pathsep=";">
+      <fileset refid="test.result.failedtests"/>
+    </pathconvert>
+
+    <condition property="skipped.output" value="${skipped.list}" else="None">
+      <not>
+        <equals arg1="${skipped.count}" arg2="0"/>
+      </not>
+    </condition>
+
+    <condition property="failed.output" value="${failed.list}" else="None">
+      <not>
+        <equals arg1="${failed.count}" arg2="0"/>
+      </not>
+    </condition>
+    <!-- End Patch 1 -->
+    
     <concat>
-      <header>Testsuites with skipped tests:${line.separator}</header>
-      <string>${toString:test.result.skippedtests}</string>
+      <header>Testsuites with skipped tests: ${line.separator}</header>
+      <string>${skipped.output}</string>
       <filterchain>
         <tokenfilter delimOutput="${line.separator}">
           <stringtokenizer delims=";"/>
@@ -2071,8 +2102,8 @@
       </filterchain>
     </concat>
     <concat>
-      <header>Testsuites with failed tests:${line.separator}</header>
-      <string>${toString:test.result.failedtests}</string>
+      <header>Testsuites with failed tests: ${line.separator}</header>
+      <string>${failed.output}</string>
       <filterchain>
         <tokenfilter delimOutput="${line.separator}">
           <stringtokenizer delims=";"/>

From a378785dab0063d20ead0f300c92e673cbddef75 Mon Sep 17 00:00:00 2001
From: Vincent Yang <yang.vincent.h@icloud.com>
Date: Thu, 11 Dec 2025 20:46:13 +0800
Subject: [PATCH 2/3] Removed unused comments

---
 build.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.xml b/build.xml
index 35fa58da3af2..6354b6c2cded 100644
--- a/build.xml
+++ b/build.xml
@@ -2062,7 +2062,6 @@
       </not>
     </fileset>
 
-    <!-- Start Patch 1 -->
     <resourcecount property="skipped.count">
       <fileset refid="test.result.skippedtests"/>
     </resourcecount>
@@ -2090,7 +2089,6 @@
         <equals arg1="${failed.count}" arg2="0"/>
       </not>
     </condition>
-    <!-- End Patch 1 -->
     
     <concat>
       <header>Testsuites with skipped tests: ${line.separator}</header>

From 2cf5a3668b45a932aad440f61222613ddfe9b51c Mon Sep 17 00:00:00 2001
From: VINCENT4486 <yang.vincent.h@icloud.com>
Date: Thu, 11 Dec 2025 21:42:04 +0800
Subject: [PATCH 3/3] Update build.xml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 build.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.xml b/build.xml
index 6354b6c2cded..2f7c0b9d3b0f 100644
--- a/build.xml
+++ b/build.xml
@@ -2089,7 +2089,6 @@
         <equals arg1="${failed.count}" arg2="0"/>
       </not>
     </condition>
-    
     <concat>
       <header>Testsuites with skipped tests: ${line.separator}</header>
       <string>${skipped.output}</string>