Merge commit '949f97f7f9' into core-update-new-2chris-core-updates-no-duplicates-attempt

Change-Id: Ibbd851541da42cc052ba58195fee033daadd57e5

Conflicts:
	gnu/local.mk
	gnu/packages/bioinformatics.scm
	gnu/packages/dictionaries.scm
	gnu/packages/display-managers.scm
	gnu/packages/engineering.scm
	gnu/packages/geo.scm
	gnu/packages/gl.scm
	gnu/packages/glib.scm
	gnu/packages/gnome-xyz.scm
	gnu/packages/gnome.scm
	gnu/packages/gtk.scm
	gnu/packages/image-processing.scm
	gnu/packages/linux.scm
	gnu/packages/llvm.scm
	gnu/packages/mail.scm
	gnu/packages/patches/eudev-rules-directory.patch
	gnu/packages/plotutils.scm
	gnu/packages/sdl.scm
	gnu/packages/syndication.scm

1 files changed, 6 insertions, 9 deletions

diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm
index 00514e7020..bcc7645fa3 100644
--- a/gnu/tests/reconfigure.scm
+++ b/gnu/tests/reconfigure.scm
@@ -92,15 +92,12 @@ generation of the system profile."
               (length (system-generations marionette))
               (1+ (length generations-prior)))
 
-            (test-assert "script activated the new generation"
-              (and (eqv? 'symlink
-                         (marionette-eval
-                          '(stat:type (lstat "/run/current-system"))
-                          marionette))
-                   (string= #$os
-                            (marionette-eval
-                             '(readlink "/run/current-system")
-                             marionette))))
+            (test-equal "script activated the new generation"
+              (string-append "/var/guix/profiles/system-"
+                             (number->string (+ 1 (length generations-prior)))
+                             "-link")
+              (marionette-eval '(readlink "/run/current-system")
+                               marionette))
 
             (test-assert "script activated user accounts"
               (marionette-eval