Merge "Update microdroid test to include protected_vm flag"

This commit is contained in:
Treehugger Robot 2021-03-16 23:05:54 +00:00 committed by Gerrit Code Review
commit 0302beb2a8
2 changed files with 2 additions and 2 deletions

View File

@ -52,7 +52,7 @@ Create the composite image using `assemble_cvd` and run it via `crosvm`. In the
future, this shall be done via [`virtmanager`](../virtmanager/).
```
$ adb shell 'HOME=/data/local/tmp; PATH=$PATH:/apex/com.android.virt/bin; assemble_cvd < /dev/null'
$ adb shell 'HOME=/data/local/tmp; PATH=$PATH:/apex/com.android.virt/bin; assemble_cvd -protected_vm < /dev/null'
$ adb shell 'cd /data/local/tmp; /apex/com.android.virt/bin/crosvm run --cid=5 --disable-sandbox --bios=bootloader --serial=type=stdout --disk=cuttlefish_runtime/composite.img'
```

View File

@ -84,7 +84,7 @@ public class MicrodroidTestCase extends BaseHostJUnit4Test {
// Run assemble_cvd to create composite.img
getDevice().executeShellCommand("HOME=" + TEST_ROOT + "; "
+ "PATH=$PATH:" + VIRT_APEX + "bin; "
+ VIRT_APEX + "bin/assemble_cvd < /dev/null");
+ VIRT_APEX + "bin/assemble_cvd -protected_vm < /dev/null");
// Make sure that composite.img is created
final String compositeImg = TEST_ROOT + "cuttlefish_runtime/composite.img";