test: support `run`, `debug` commands in basic NixOS tests

Currently, this only affects the basic NixOS test `clightning-replication`.
This commit is contained in:
Erik Arvstedt 2022-12-12 11:57:15 +01:00 committed by Greg Shuflin
parent 72f09458b6
commit b5293b7e53
2 changed files with 6 additions and 7 deletions

View File

@ -27,4 +27,9 @@ let
inherit (test) meta passthru; inherit (test) meta passthru;
} // test; } // test;
in in
runTest runTest // {
# A VM runner for interactive use
run = pkgs.writers.writeBashBin "run-vm" ''
. ${./run-vm.sh} ${runTest.driver} "$@"
'';
}

View File

@ -52,11 +52,6 @@ let
]; ];
}; };
# A VM runner for interactive use
run = pkgs.writers.writeBashBin "run-vm" ''
. ${./run-vm.sh} ${test.driver} "$@"
'';
mkContainer = legacyInstallDirs: mkContainer = legacyInstallDirs:
extra-container.lib.buildContainers { extra-container.lib.buildContainers {
inherit system legacyInstallDirs; inherit system legacyInstallDirs;
@ -139,7 +134,6 @@ let
in in
test // { test // {
inherit inherit
run
vm vm
container container
# For NixOS with `system.stateVersion` <22.05 # For NixOS with `system.stateVersion` <22.05