summary refs log tree commit diff
path: root/gnu/tests/install.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-04-11 00:10:23 +0200
committerMarius Bakke <mbakke@fastmail.com>2020-04-11 00:10:23 +0200
commitbdb90df764661c11b37c988ea129c8e7a01b1889 (patch)
treec320b71b136bfcc5e5ec949279a05c8134fb0cca /gnu/tests/install.scm
parentb859a1bf7953eb98668cb11b459cde48b0dce991 (diff)
parent8ec9c5fd880be35fe322b0d4dbc69bd2c6c89ef1 (diff)
downloadguix-bdb90df764661c11b37c988ea129c8e7a01b1889.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/tests/install.scm')
-rw-r--r--gnu/tests/install.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index b0b40f2764..713e03194b 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -232,7 +232,9 @@ packages defined in installation-os."
                                  os (list target))
                                 #:disk-image-size install-size
                                 #:file-system-type
-                                installation-disk-image-file-system-type)))
+                                installation-disk-image-file-system-type
+                                ;; Don't provide substitutes; too big.
+                                #:substitutable? #f)))
     (define install
       (with-imported-modules '((guix build utils)
                                (gnu build marionette))
@@ -296,7 +298,8 @@ packages defined in installation-os."
               (exit #$(and gui-test
                            (gui-test #~marionette)))))))
 
-    (gexp->derivation "installation" install)))
+    (gexp->derivation "installation" install
+                      #:substitutable? #f)))      ;too big
 
 (define* (qemu-command/writable-image image #:key (memory-size 256))
   "Return as a monadic value the command to run QEMU on a writable copy of
@@ -1122,6 +1125,8 @@ build (current-guix) and then store a couple of full system images.")
                                #:os installation-os-for-gui-tests
                                #:install-size install-size
                                #:target-size target-size
+                               #:installation-disk-image-file-system-type
+                               "iso9660"
                                #:gui-test
                                (lambda (marionette)
                                  (gui-test-program