low level: testmode: take path to disk image instead of using /dev/null

.. in exactly the same way GUI and TUI installer do, streamlining them.

Up until now, testing the TUI installer often involved hand-editing the
`run-env-info.json` to put some proper disk sizes > 0 in place. This
makes this process a lot easier.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>

diff --git a/Makefile b/Makefile
index 5e94c2998ca32682bfbf57b0aac6e9cd2a10a335..6f64c4e482d4fc1ee77022d45d59a2497678cd84 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -139,26 +139,31 @@ cd-info.test:
 
 check-pve: prepare-check-env test.img
        rm -f cd-info.test; $(MAKE) cd-info.test
-       ./proxmox-low-level-installer dump-env -t
+       ./proxmox-low-level-installer dump-env -t test.img
        G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
 
 check-pve-multidisks: prepare-check-env test.img test2.img test3.img test4.img test5.big.img
        rm -f cd-info.test; $(MAKE) cd-info.test
-       ./proxmox-low-level-installer dump-env -t
+       ./proxmox-low-level-installer dump-env -t test.img,test2.img,test3.img,test4.img,test5.big.img
        G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img,test2.img,test3.img,test4.img,test5.big.img
 
 check-pve-tui: prepare-check-env test.img
        rm -f cd-info.test; $(MAKE) cd-info.test
-       ./proxmox-low-level-installer dump-env -t
+       ./proxmox-low-level-installer dump-env -t test.img
        testdir/usr/bin/proxmox-tui-installer -t test.img 2>testdir/run/stderr
 
+check-pve-tui-multidisks: prepare-check-env test.img test2.img test3.img test4.img test5.big.img
+       rm -f cd-info.test; $(MAKE) cd-info.test
+       ./proxmox-low-level-installer dump-env -t test.img,test2.img,test3.img,test4.img,test5.big.img
+       testdir/usr/bin/proxmox-tui-installer -t test.img,test2.img,test3.img,test4.img,test5.big.img
+
 prepare-check-pmg: prepare-check-env test.img
        rm -f cd-info.test; $(MAKE) \
            PRODUCT=pmg \
            PRODUCTLONG="Proxmox Mail Gateway" \
            ISONAME='proxmox-mail-gateway' \
            cd-info.test
-       ./proxmox-low-level-installer dump-env -t
+       ./proxmox-low-level-installer dump-env -t test.img
 
 check-pmg: prepare-check-pmg
        G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
@@ -172,7 +177,7 @@ prepare-check-pbs: prepare-check-env test.img
            PRODUCTLONG='Proxmox Backup Server' \
            ISONAME='proxmox-backup-server' \
            cd-info.test
-       ./proxmox-low-level-installer dump-env -t
+       ./proxmox-low-level-installer dump-env -t test.img
 
 check-pbs: prepare-check-pbs
        G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img

diff --git a/proxmox-low-level-installer b/proxmox-low-level-installer
index 814961e5d5a4e73457aaa5df85e7b87e38708af7..0f2bf4f68f8cc1e11d85624521bf246694726c35 100755 (executable)
--- a/proxmox-low-level-installer
+++ b/proxmox-low-level-installer
@@ -11,14 +11,14 @@ use JSON;
 use Time::HiRes qw(usleep);
 
 {
-    my $test_mode;
+    my $test_image;
     GetOptions(
-       'test-mode|t' => \$test_mode
+       'test-image|t=s' => \$test_image
     ) or die "usage error\n";
 
-    # FIXME: use cleaner approach for setting tet mode?
-    Proxmox::Install::ISOEnv::set_test_image('/dev/null') if $test_mode;
+    Proxmox::Install::ISOEnv::set_test_image($test_image) if $test_image;
 }
+
 use Proxmox::Install::ISOEnv;
 use Proxmox::Install::RunEnv;