branch wip-ppc64le updated: tests: guix-package.sh: Use coreutils instead of emacs.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

marusich pushed a commit to branch wip-ppc64le
in repository guix.

The following commit(s) were added to refs/heads/wip-ppc64le by this push:
     new 1900a62  tests: guix-package.sh: Use coreutils instead of emacs.
1900a62 is described below

commit 1900a6227e99427cf3b28a86dbbee2c55f375f8c
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Sat Mar 6 23:06:23 2021 -0800

    tests: guix-package.sh: Use coreutils instead of emacs.
    
    The emacs package is currently only supported on x86_64-linux.  As a result,
    some tests that use it as an arbitrary package to verify behavior involving
    supported systems (e.g., the tests that invoke "guix package -A") fail when
    run on other systems.  This change fixes that problem by using coreutils
    instead, since it is supported on all systems.
    
    * tests/guix-package.sh: Replace all uses of the emacs package with 
coreutils.
    (emacs-foo-bar): Rename to coreutils-foo-bar.
    (emacs-foo-bar-patched): Rename to coreutils-foo-bar-patched.
    (super-non-portable-emacs): Rename to super-non-portable-coreutils.
---
 tests/guix-package.sh | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/tests/guix-package.sh b/tests/guix-package.sh
index 7eaad68..90b4705 100644
--- a/tests/guix-package.sh
+++ b/tests/guix-package.sh
@@ -1,6 +1,7 @@
 # GNU Guix --- Functional package management for GNU
 # Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 
Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
+# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 #
 # This file is part of GNU Guix.
 #
@@ -267,22 +268,22 @@ mkdir "$module_dir"
 cat > "$module_dir/foo.scm"<<EOF
 (define-module (foo)
   #:use-module (guix packages)
-  #:use-module (gnu packages emacs))
+  #:use-module (gnu packages base))
 
 (define-public x
-  (package (inherit emacs)
-    (name "emacs-foo-bar")
+  (package (inherit coreutils)
+    (name "coreutils-foo-bar")
     (version "42.77.0")))
 EOF
 
-guix package -A emacs-foo-bar -L "$module_dir" | grep 42
-guix package -i emacs-foo-bar@42 -n -L "$module_dir"
+guix package -A coreutils-foo-bar -L "$module_dir" | grep 42
+guix package -i coreutils-foo-bar@42 -n -L "$module_dir"
 
 # Same thing using the 'GUIX_PACKAGE_PATH' environment variable.
 GUIX_PACKAGE_PATH="$module_dir"
 export GUIX_PACKAGE_PATH
-guix package -A emacs-foo-bar | grep 42
-guix package -i emacs-foo-bar@42 -n
+guix package -A coreutils-foo-bar | grep 42
+guix package -i coreutils-foo-bar@42 -n
 
 # Make sure GUIX_PACKAGE_PATH/'-L' takes precedence in case of duplicate 
packages.
 cat > "$module_dir/bar.scm"<<EOF
@@ -299,32 +300,32 @@ guix package -i hello -n 2>&1 | grep choosing.*bar.scm
   guix package -i hello -n -L "$module_dir" 2>&1 | grep choosing.*bar.scm )
 
 # Make sure patches that live under $GUIX_PACKAGE_PATH are found.
-cat > "$module_dir/emacs.patch"<<EOF
+cat > "$module_dir/coreutils.patch"<<EOF
 This is a fake patch.
 EOF
 cat > "$module_dir/foo.scm"<<EOF
 (define-module (foo)
   #:use-module (guix packages)
   #:use-module (gnu packages)
-  #:use-module (gnu packages emacs))
+  #:use-module (gnu packages base))
 
 (define-public x
-  (package (inherit emacs)
-    (source (origin (inherit (package-source emacs))
-              (patches (list (search-patch "emacs.patch")))))
-    (name "emacs-foo-bar-patched")
+  (package (inherit coreutils)
+    (source (origin (inherit (package-source coreutils))
+              (patches (list (search-patch "coreutils.patch")))))
+    (name "coreutils-foo-bar-patched")
     (version "42.42.42")))
 
 (define-public y
-  (package (inherit emacs)
-    (name "super-non-portable-emacs")
+  (package (inherit coreutils)
+    (name "super-non-portable-coreutils")
     (supported-systems '("foobar64-hurd"))))
 EOF
-guix package -i emacs-foo-bar-patched -n
+guix package -i coreutils-foo-bar-patched -n
 
 # Same when -L is used.
 ( unset GUIX_PACKAGE_PATH;                                     \
-  guix package -L "$module_dir" -i emacs-foo-bar-patched -n )
+  guix package -L "$module_dir" -i coreutils-foo-bar-patched -n )
 
 # Make sure installing from a file works.
 cat > "$module_dir/package.scm"<<EOF
@@ -347,8 +348,8 @@ rm "$module_dir/package.scm"
 
 # This one should not show up in searches since it's no supported on the
 # current system.
-test "`guix package -A super-non-portable-emacs`" = ""
-test "`guix package -s super-non-portable-emacs | grep ^systems:`" = "systems: 
"
+test "`guix package -A super-non-portable-coreutils`" = ""
+test "`guix package -s super-non-portable-coreutils | grep ^systems:`" = 
"systems: "
 
 # Don't upgrade packages marked for removal: <http://bugs.gnu.org/27262>.
 guix package --bootstrap -p "$profile" -i guile-bootstrap
@@ -484,5 +485,5 @@ echo "(open-output-file \"$module_dir/ready\") (sleep 60)" \
 guix package -m "$module_dir/manifest.scm" -p "$module_dir/profile" &
 pid=$!
 while [ ! -f "$module_dir/ready" ] ; do sleep 0.5 ; done
-if guix install emacs -p "$module_dir/profile"; then kill $pid; false; else 
true; fi
+if guix install coreutils -p "$module_dir/profile"; then kill $pid; false; 
else true; fi
 kill $pid