From ff4969e8ce24c072de543657366ca0688fcb9ffa Mon Sep 17 00:00:00 2001
From: Cheng-Cheng Lo <locc@google.com>
Date: Mon, 7 Oct 2024 15:45:30 +0800
Subject: [PATCH] ANDROID: use INDIVIDUAL_LEAVES for kselftests parser
 resolution

Bug: 371481715
Test: presubmit
Change-Id: I7b4c7d4ea7683f12c140c2ac7fc3ad67f02cd4cb
Signed-off-by: Cheng-Cheng Lo <locc@google.com>
---
 tools/testing/selftests/android/config_arm.xml    | 1 +
 tools/testing/selftests/android/config_arm64.xml  | 1 +
 tools/testing/selftests/android/config_x86.xml    | 1 +
 tools/testing/selftests/android/config_x86_64.xml | 1 +
 4 files changed, 4 insertions(+)

diff --git a/tools/testing/selftests/android/config_arm.xml b/tools/testing/selftests/android/config_arm.xml
index 15bf416407a8..28a18dd12306 100644
--- a/tools/testing/selftests/android/config_arm.xml
+++ b/tools/testing/selftests/android/config_arm.xml
@@ -24,6 +24,7 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
         <option name="exit-code-skip" value="4" />
         <option name="skip-binary-check" value="true" />
+        <option name="ktap-result-parser-resolution" value="INDIVIDUAL_LEAVES" />
         <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="cd &ktest_dir;; ./kselftest_binderfs_binderfs_test" />
         <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="cd &ktest_dir;; ./kselftest_breakpoints_breakpoint_test" />
         <option name="test-command-line" key="kselftest_capabilities_test_execve" value="cd &ktest_dir;; ./kselftest_capabilities_test_execve" />
diff --git a/tools/testing/selftests/android/config_arm64.xml b/tools/testing/selftests/android/config_arm64.xml
index ca95d4dddeda..9c06d3d6fda6 100644
--- a/tools/testing/selftests/android/config_arm64.xml
+++ b/tools/testing/selftests/android/config_arm64.xml
@@ -24,6 +24,7 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
         <option name="exit-code-skip" value="4" />
         <option name="skip-binary-check" value="true" />
+        <option name="ktap-result-parser-resolution" value="INDIVIDUAL_LEAVES" />
         <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="cd &ktest_dir;; ./kselftest_binderfs_binderfs_test" />
         <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="cd &ktest_dir;; ./kselftest_breakpoints_breakpoint_test" />
         <option name="test-command-line" key="kselftest_capabilities_test_execve" value="cd &ktest_dir;; ./kselftest_capabilities_test_execve" />
diff --git a/tools/testing/selftests/android/config_x86.xml b/tools/testing/selftests/android/config_x86.xml
index 98c68559b453..3ccb58c690d8 100644
--- a/tools/testing/selftests/android/config_x86.xml
+++ b/tools/testing/selftests/android/config_x86.xml
@@ -24,6 +24,7 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
         <option name="exit-code-skip" value="4" />
         <option name="skip-binary-check" value="true" />
+        <option name="ktap-result-parser-resolution" value="INDIVIDUAL_LEAVES" />
         <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="cd &ktest_dir;; ./kselftest_binderfs_binderfs_test" />
         <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="cd &ktest_dir;; ./kselftest_breakpoints_breakpoint_test" />
         <option name="test-command-line" key="kselftest_capabilities_test_execve" value="cd &ktest_dir;; ./kselftest_capabilities_test_execve" />
diff --git a/tools/testing/selftests/android/config_x86_64.xml b/tools/testing/selftests/android/config_x86_64.xml
index 0e9ca3f737e1..ae5511e34064 100644
--- a/tools/testing/selftests/android/config_x86_64.xml
+++ b/tools/testing/selftests/android/config_x86_64.xml
@@ -24,6 +24,7 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
         <option name="exit-code-skip" value="4" />
         <option name="skip-binary-check" value="true" />
+        <option name="ktap-result-parser-resolution" value="INDIVIDUAL_LEAVES" />
         <option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="cd &ktest_dir;; ./kselftest_binderfs_binderfs_test" />
         <option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="cd &ktest_dir;; ./kselftest_breakpoints_breakpoint_test" />
         <option name="test-command-line" key="kselftest_capabilities_test_execve" value="cd &ktest_dir;; ./kselftest_capabilities_test_execve" />