summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Liaw <edliaw@google.com>2022-03-22 01:48:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-22 01:48:14 +0000
commit584fb4ac22dcfd9ec0acbfbf8f72211cbf511132 (patch)
tree6ea21901751900e0f6bcfda32cc327a9eda93186
parent1f65072c0a03393fa47d7525bda6d070d639e2ff (diff)
parent8fd687a5540044e84a71a055740d94bb746a3b0b (diff)
downloadkernel-584fb4ac22dcfd9ec0acbfbf8f72211cbf511132.tar.gz
Merge "ltp: Explicitly skip test on LTP's TCONF exit code" am: bee50194de am: 8fd687a554
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/kernel/+/2034428 Change-Id: I485aee8a52ae98391e8c296274d3a420452a9bfd
-rw-r--r--ltp/testcase/tools/template/template.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/ltp/testcase/tools/template/template.xml b/ltp/testcase/tools/template/template.xml
index a727ebe2..5a49f1f0 100644
--- a/ltp/testcase/tools/template/template.xml
+++ b/ltp/testcase/tools/template/template.xml
@@ -42,7 +42,9 @@
<option name="teardown-command" value="rm -rf &ltp_dir;/tmp" />
</target_preparer>
- <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
+ <test class="com.android.tradefed.testtype.binary.KernelTargetTest">
+ <!-- Identify LTP's TCONF code (incompatible configuration) as a skip. -->
+ <option name="exit-code-skip" value="32" />
<option name="ignore-binary-check" value="true" />
<!-- Set binary timeout to be 18 min which is greater than the default 5 min timeout. Otherwise TF will retry to the command and attempt to do device recovery. -->
<option name="per-binary-timeout" value="1080000" />