Merge branch 'master' into core-updates

1 files changed, 16 insertions, 1 deletions

diff --git a/tests/guix-package.sh b/tests/guix-package.sh
index 7ad0699380..f9fb31033e 100644
--- a/tests/guix-package.sh
+++ b/tests/guix-package.sh
@@ -394,6 +394,19 @@ guix package -I | grep guile
 test `guix package -I | wc -l` -eq 1
 guix package --rollback --bootstrap
 
+# Applying two manifests.
+cat > "$module_dir/manifest2.scm"<<EOF
+(use-modules (gnu packages bootstrap) (guix))
+(define p (package (inherit %bootstrap-guile) (name "eliug")))
+(packages->manifest (list p))
+EOF
+guix package --bootstrap \
+     -m "$module_dir/manifest.scm" -m "$module_dir/manifest2.scm"
+guix package -I | grep guile
+guix package -I | grep eliug
+test `guix package -I | wc -l` -eq 2
+guix package --rollback --bootstrap
+
 # Applying a manifest file with inferior packages.
 cat > "$module_dir/manifest.scm"<<EOF
 (use-modules (guix inferior))
@@ -455,8 +468,10 @@ guix package --list-profiles | grep '\.guix-profile'
 
 # Make sure we can properly lock a profile.
 mkdir "$module_dir"
-echo '(sleep 60)' > "$module_dir/manifest.scm"
+echo "(open-output-file \"$module_dir/ready\") (sleep 60)" \
+     > "$module_dir/manifest.scm"
 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
 kill $pid