From 952cd3773f1842bf2b8594a523d98ee6359fd2b2 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 29 Jul 2022 15:37:29 +0200
Subject: [PATCH] run-tests: support tests with multiple VMs in `run`

---
 test/run-tests.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/run-tests.sh b/test/run-tests.sh
index d48be35..9824a16 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -137,7 +137,7 @@ run() {
             echo 'is_interactive = True'
             echo 'exec(open(os.environ["testScript"]).read())'
             # Start VM
-            echo 'start_all()'
+            echo 'if "machine" in vars(): machine.start()'
             # Start REPL.
             # Use `code.interact` for the REPL instead of the builtin test driver REPL
             # because it supports low featured terminals like Emacs' shell-mode.
@@ -155,7 +155,6 @@ run() {
         NIX_PATH="$NIX_PATH" \
         TMPDIR="$TMPDIR" \
         USE_TMPDIR=1 \
-        NIX_DISK_IMAGE=$TMPDIR/img.qcow2 \
         QEMU_OPTS="-smp $numCPUs -m $memoryMiB -nographic $QEMU_OPTS"  \
         QEMU_NET_OPTS="$QEMU_NET_OPTS" \
         $TMPDIR/driver/bin/nixos-test-driver <(echo "$tests")