[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/06: tests: Fix incorrect use of 'file-append'.
From: |
Ludovic Courtès |
Subject: |
06/06: tests: Fix incorrect use of 'file-append'. |
Date: |
Thu, 7 Sep 2017 18:11:36 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 4e39604111e53a1aab74fdfe9360ec71c2fd1a85
Author: Ludovic Courtès <address@hidden>
Date: Fri Sep 8 00:04:38 2017 +0200
tests: Fix incorrect use of 'file-append'.
Fixes a regression introduced in fbc7b1f12561159e0ec3f6459d336f95cf2ce503.
* gnu/tests/install.scm (run-install)[install]: Don't use 'file-append'
with a string as its first argument; use a gexp with 'string-append'
instead.
Use a gexp instead of a list for "-cdrom IMG".
---
gnu/tests/install.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 93c8a89..4974386 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -238,11 +238,11 @@ packages defined in installation-os."
"-m" "800"
#$@(cond
((string=? "ext4"
installation-disk-image-file-system-type)
- `("-drive"
- ,(file-append "file=" image
- ",if=virtio,readonly")))
+ #~("-drive"
+ ,(string-append "file=" #$image
+ ",if=virtio,readonly")))
((string=? "iso9660"
installation-disk-image-file-system-type)
- `("-cdrom" ,image))
+ #~("-cdrom" #$image))
(else
(error
"unsupported installation-disk-image-file-system-type:"
- branch master updated (81635ad -> 4e39604), Ludovic Courtès, 2017/09/07
- 02/06: gnu: elogind: Remove unnecessary configure flag., Ludovic Courtès, 2017/09/07
- 01/06: doc: Update elogind URL., Ludovic Courtès, 2017/09/07
- 03/06: marionette: 'wait-for-file' can be passed a read procedure., Ludovic Courtès, 2017/09/07
- 04/06: services: elogind: Add default value., Ludovic Courtès, 2017/09/07
- 06/06: tests: Fix incorrect use of 'file-append'.,
Ludovic Courtès <=
- 05/06: gnu: elogind: Use itself as the cgroup controller., Ludovic Courtès, 2017/09/07