| commit | 16da9964c3849cb3cd40f0619a817f9338ed635d | [log] [tgz] |
|---|---|---|
| author | Inseob Kim <inseob@google.com> | Thu Feb 22 01:26:18 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 22 01:26:18 2024 +0000 |
| tree | abbb71bb3e384899fc82f7371f715ca735d7a2b3 | |
| parent | 9d260af17f94f0c0d4abd1afb05dc5428326dd1e [diff] | |
| parent | 07bdd9e41fc496530c13cdc3e7af1303286f97c2 [diff] |
Merge "Allow crashCommand for tombstone to fail" into main am: 07bdd9e41f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2970955 Change-Id: I60e0f3116a6291827e0a3ff828eb588a3181c079 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java index 4503cd3..0901fd4 100644 --- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java +++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -553,7 +553,8 @@ mMicrodroidDevice.enableAdbRoot(); CommandRunner microdroid = new CommandRunner(mMicrodroidDevice); - microdroid.run(crashCommand); + // can crash in the middle of crashCommand; fail is ok + microdroid.tryRun(crashCommand); // check until microdroid is shut down waitForCrosvmExit(android, testStartTime);