guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/04: tests: Adjust 'guix pack -f squashfs' test.


From: guix-commits
Subject: 04/04: tests: Adjust 'guix pack -f squashfs' test.
Date: Sat, 23 Mar 2019 19:14:06 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 9c2e58564f3c8b53ce86d5791e3ea5818e1a4fd6
Author: Ludovic Courtès <address@hidden>
Date:   Sun Mar 24 00:10:51 2019 +0100

    tests: Adjust 'guix pack -f squashfs' test.
    
    This is a followup to 427c87d0bdc06cc3ee7fc220fd3ad36084412533.
    
    * tests/pack.scm ("squashfs-image + localstatedir"): Expect "bin" to be
    a relative symlink.
---
 tests/pack.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/pack.scm b/tests/pack.scm
index 40473a9..ea88cd8 100644
--- a/tests/pack.scm
+++ b/tests/pack.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017, 2018 Ludovic Courtès <address@hidden>
+;;; Copyright © 2017, 2018, 2019 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -206,7 +206,11 @@
                                       (file-exists? "var/guix/db/db.sqlite")
                                       (string=? (string-append 
#$%bootstrap-guile "/bin")
                                                 (pk 'binlink (readlink bin)))
-                                      (string=? (string-append #$profile 
"/bin")
+
+                                      ;; This is a relative symlink target.
+                                      (string=? (string-drop
+                                                 (string-append #$profile 
"/bin")
+                                                 1)
                                                 (pk 'guilelink (readlink 
"bin"))))
                              (mkdir #$output))))))))
       (built-derivations (list check)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]