diff options
| author | Julien Desprez <jdesprez@google.com> | 2021-10-02 19:45:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-02 19:45:26 +0000 |
| commit | 2b68a64096b2888b6e84b2763a287d0581730e5f (patch) | |
| tree | ad54f63a38af50af1a948bc364c59eeb2f38c43e | |
| parent | 2eee8aa8695a86dbbf061e00d343b3404616a348 (diff) | |
| parent | 324e661a814ce9439dc464809499d4ae9351ff53 (diff) | |
| download | extras-temp_sam_202323961.tar.gz | |
Merge "Replace GTest options by proper preparers" am: 324e661a81temp_sam_202323961
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1843598
Change-Id: Ifb1931ed2b9c9188278c679ecce7b7930c4d5971
| -rw-r--r-- | tests/kernel.config/AndroidTest.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/kernel.config/AndroidTest.xml b/tests/kernel.config/AndroidTest.xml index 7066ae7e..19da90af 100644 --- a/tests/kernel.config/AndroidTest.xml +++ b/tests/kernel.config/AndroidTest.xml @@ -24,11 +24,14 @@ <option name="push" value="CtsKernelConfigTestCases->/data/local/tmp/CtsKernelConfigTestCases" /> <option name="append-bitness" value="true" /> </target_preparer> + <!-- Make sure there is some data in the pstore then reboot --> + <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> + <option name="run-command" value="echo HELLOWORLD >/dev/pmsg0" /> + <option name="throw-if-cmd-fail" value="true" /> + </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" /> <test class="com.android.tradefed.testtype.GTest" > <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="CtsKernelConfigTestCases" /> - <!-- Make sure there is some data in the pstore --> - <option name="before-test-cmd" value="echo HELLOWORLD >/dev/pmsg0" /> - <option name="reboot-before-test" value="true" /> </test> </configuration> |