[PATCH v3 26/29] tests/vm: allow interactive login as root

[Alex Bennée]

This is useful when debugging and you want to add packages to an
image.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/vm/Makefile.include | 3 ++-
 tests/vm/basevm.py        | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index d80ca79a28..14188bba1c 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -66,6 +66,7 @@ endif
        @echo "Special variables:"
        @echo "    BUILD_TARGET=foo              - Override the build target"
        @echo "    DEBUG=1                       - Enable verbose output on 
host and interactive debugging"
+       @echo "    ROOT_USER=1                   - Login as root user for 
interactive shell"
        @echo '    EXTRA_CONFIGURE_OPTS="..."    - Pass to configure step'
        @echo "    J=[0..9]*                     - Override the -jN parameter 
for make commands"
        @echo "    LOG_CONSOLE=1                 - Log console to file in: 
~/.cache/qemu-vm "
@@ -141,6 +142,6 @@ vm-boot-ssh-%: $(IMAGES_DIR)/%.img $(VM_VENV)
                $(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \
                $(if $(LOG_CONSOLE),--log-console) \
                --image "$<" \
-               --interactive \
+               $(if $(ROOT_USER),--interactive-root,-interactive) \
                false, \
                "  VM-BOOT-SSH $*") || true
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 6f3f2e76df..6d41ac7574 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -612,8 +612,11 @@ def get_default_jobs():
     parser.add_argument("--source-path", default=None,
                         help="Path of source directory, "\
                         "for finding additional files. ")
-    parser.add_argument("--interactive", "-I", action="store_true",
-                        help="Interactively run command")
+    int_ops = parser.add_mutually_exclusive_group()
+    int_ops.add_argument("--interactive", "-I", action="store_true",
+                         help="Interactively run command")
+    int_ops.add_argument("--interactive-root", action="store_true",
+                         help="Interactively run command as root")
     parser.add_argument("--snapshot", "-s", action="store_true",
                         help="run tests with a snapshot")
     parser.add_argument("--genisoimage", default="genisoimage",
@@ -675,6 +678,8 @@ def main(vmcls, config=None):
         exitcode = 3
     if args.interactive:
         vm.ssh()
+    elif args.interactive_root:
+        vm.ssh_root()
 
     if not args.snapshot:
         vm.graceful_shutdown()
-- 
2.39.5