guix-commits
[Top][All Lists]
Advanced

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

06/06: pack: Adjust test to '--dry-run' changes.


From: guix-commits
Subject: 06/06: pack: Adjust test to '--dry-run' changes.
Date: Mon, 30 Mar 2020 18:07:41 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit b771e0176a9cafaaf5fc279a7f3e5e3033b5fb4f
Author: Ludovic Courtès <address@hidden>
AuthorDate: Tue Mar 31 00:05:02 2020 +0200

    pack: Adjust test to '--dry-run' changes.
    
    This is a followup to 131f50cdc9dbb7183023f4dae759876a9e700bef.
    
    * tests/guix-pack.sh: Use '--no-grafts' in conjunction with '-n' and '-d'.
---
 tests/guix-pack.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh
index 7a0f340..14e3cda 100644
--- a/tests/guix-pack.sh
+++ b/tests/guix-pack.sh
@@ -1,6 +1,6 @@
 # GNU Guix --- Functional package management for GNU
 # Copyright © 2018 Chris Marusich <address@hidden>
-# Copyright © 2018, 2019 Ludovic Courtès <address@hidden>
+# Copyright © 2018, 2019, 2020 Ludovic Courtès <address@hidden>
 #
 # This file is part of GNU Guix.
 #
@@ -105,8 +105,8 @@ guix pack -R --dry-run --bootstrap -S /mybin=bin 
guile-bootstrap
 
 # Make sure package transformation options are honored.
 mkdir -p "$test_directory"
-drv1="`guix pack -n guile 2>&1 | grep pack.*\.drv`"
-drv2="`guix pack -n --with-source=guile=$test_directory guile 2>&1 | grep 
pack.*\.drv`"
+drv1="`guix pack --no-grafts -n guile 2>&1 | grep pack.*\.drv`"
+drv2="`guix pack --no-grafts -n --with-source=guile=$test_directory guile 2>&1 
| grep pack.*\.drv`"
 test -n "$drv1"
 test "$drv1" != "$drv2"
 
@@ -117,6 +117,6 @@ EOF
 cat > "$test_directory/manifest2.scm" <<EOF
 (specifications->manifest '("emacs"))
 EOF
-drv="`guix pack -nd -m "$test_directory/manifest1.scm" -m 
"$test_directory/manifest2.scm"`"
-guix gc -R "$drv" | grep `guix build guile -nd`
-guix gc -R "$drv" | grep `guix build emacs -nd`
+drv="`guix pack --no-grafts -d -m "$test_directory/manifest1.scm" -m 
"$test_directory/manifest2.scm"`"
+guix gc -R "$drv" | grep `guix build guile -d --no-grafts`
+guix gc -R "$drv" | grep `guix build emacs -d --no-grafts`



reply via email to

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