diff options
Diffstat (limited to 'gnu/tests/install.scm')
| -rw-r--r-- | gnu/tests/install.scm | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index db355b85ca..9656e5f41f 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -163,7 +163,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.4G \\ + mkpart primary ext2 3M 1.6G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L my-root /dev/vdb2 @@ -188,7 +188,7 @@ guix --version export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ - mkpart ext2 1M 1.4G \\ + mkpart ext2 1M 1.6G \\ set 1 legacy_boot on mkfs.ext4 -L my-root -O '^64bit' /dev/vdb1 mount /dev/vdb1 /mnt @@ -247,6 +247,8 @@ packages defined in installation-os." (operating-system (operating-system-with-gc-roots os (list target guile-final))) + ;; Do not compress to speed-up the tests. + (compression? #f) ;; Don't provide substitutes; too big. (substitutable? #f))))) (define install @@ -301,7 +303,8 @@ packages defined in installation-os." ;; Run SCRIPT. It typically invokes 'reboot' as a last step and ;; thus normally gets killed with SIGTERM by PID 1. (let ((status (marionette-eval '(system #$script) marionette))) - (exit (or (equal? (status:term-sig status) SIGTERM) + (exit (or (eof-object? status) + (equal? (status:term-sig status) SIGTERM) (equal? (status:exit-val status) 0))))) (when #$(->bool gui-test) @@ -416,7 +419,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vda mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.4G \\ + mkpart primary ext2 3M 1.6G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L my-root /dev/vda2 @@ -628,8 +631,8 @@ guix --version export GUIX_BUILD_OPTIONS=--no-grafts parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.4G \\ - mkpart primary ext2 1.4G 2.8G \\ + mkpart primary ext2 3M 1.6G \\ + mkpart primary ext2 1.6G 3.2G \\ set 1 boot on \\ set 1 bios_grub on yes | mdadm --create /dev/md0 --verbose --level=mirror --raid-devices=2 \\ @@ -655,7 +658,7 @@ by 'mdadm'.") %raid-root-os-source #:script %raid-root-installation-script - #:target-size (* 2800 MiB))) + #:target-size (* 3200 MiB))) (command (qemu-command/writable-image image))) (run-basic-test %raid-root-os `(,@command) "raid-root-os"))))) @@ -716,7 +719,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts ls -l /run/current-system/gc-roots parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1.4G \\ + mkpart primary ext2 3M 1.6G \\ set 1 boot on \\ set 1 bios_grub on echo -n " %luks-passphrase " | \\ |