diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-08-28 23:48:14 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-08-29 00:09:44 +0200 |
| commit | 334bda9a9e01b73b772b3f30b04abea35e5391f8 (patch) | |
| tree | 535eea82144ae697f022bcfe1854dd875659486b /gnu | |
| parent | 40d28609f759b1445583f6f77005f92295f1213b (diff) | |
| download | patches-334bda9a9e01b73b772b3f30b04abea35e5391f8.tar patches-334bda9a9e01b73b772b3f30b04abea35e5391f8.tar.gz | |
tests: Make sure /var/guix/gcroots/profiles is a valid symlink.
Reported by csanchezdll@gmail.com (Carlos Sánchez de La Lama)
at <https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01641.html>.
* gnu/build/install.scm (directives): Add /var/guix/gcroots/profiles
symlink.
* gnu/tests/base.scm (run-basic-test)["/var/guix/gcroots/profiles is a
valid symlink"]: New test.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/build/install.scm | 6 | ||||
| -rw-r--r-- | gnu/tests/base.scm | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/gnu/build/install.scm b/gnu/build/install.scm index aebf38c066..7431a09021 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,6 +118,10 @@ STORE." ("/var/guix/gcroots/booted-system" -> "/run/booted-system") ("/var/guix/gcroots/current-system" -> "/run/current-system") + ;; XXX: 'guix-register' creates this symlink with a wrong target, so + ;; create it upfront to be sure. + ("/var/guix/gcroots/profiles" -> "/var/guix/profiles") + (directory "/bin") (directory "/tmp" 0 0 #o1777) ; sticky bit (directory "/var/tmp" 0 0 #o1777) diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 0076566c27..ca6f76c0f8 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -217,6 +217,15 @@ info --version") #f)))) marionette)) + ;; This symlink is currently unused, but better have it point to the + ;; right place. See + ;; <https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01641.html>. + (test-equal "/var/guix/gcroots/profiles is a valid symlink" + "/var/guix/profiles" + (marionette-eval '(readlink "/var/guix/gcroots/profiles") + marionette)) + + (test-assert "screendump" (begin (marionette-control (string-append "screendump " #$output |