From ef674a24c527eaf54801707d34dbf5d12ec139cb Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 22 Apr 2020 15:43:43 +0200
Subject: profiles: Add lowerable <profile> record type.

* guix/profiles.scm (<profile>): New record type.
* tests/profiles.scm ("<profile>"): New test.
---
 tests/profiles.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/profiles.scm b/tests/profiles.scm
index 21c912a532..055924ba3e 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -223,6 +223,17 @@
                  (string=? (dirname (readlink bindir))
                            (derivation->output-path guile))))))
 
+(test-assertm "<profile>"
+  (mlet* %store-monad
+      ((entry ->   (package->manifest-entry %bootstrap-guile))
+       (profile -> (profile (hooks '()) (locales? #f)
+                            (content (manifest (list entry)))))
+       (drv        (lower-object profile))
+       (profile -> (derivation->output-path drv))
+       (bindir ->  (string-append profile "/bin"))
+       (_          (built-derivations (list drv))))
+    (return (file-exists? (string-append bindir "/guile")))))
+
 (test-assertm "profile-derivation relative symlinks, one entry"
   (mlet* %store-monad
       ((entry ->   (package->manifest-entry %bootstrap-guile))
-- 
cgit v1.2.3


From 5dfe02c60767a633c67f7f6fc9557b54b3c99b63 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 27 Apr 2020 22:12:59 +0200
Subject: tests: Remove trailing commas in JSON tests.

These commas are rejected by Guile-JSON 3.5.0.

* tests/crate.scm (test-foo-dependencies)
(test-root-dependencies, test-intermediate-1-dependencies)
(test-intermediate-2-dependencies): Remove trailing commas.
* tests/gem.scm (test-bar-json): Likewise.
* tests/pypi.scm (test-json): Likewise.
---
 tests/crate.scm | 23 ++++++++++++-----------
 tests/gem.scm   |  2 +-
 tests/pypi.scm  |  7 ++++---
 3 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'tests')

diff --git a/tests/crate.scm b/tests/crate.scm
index aa51faebf9..61a04f986b 100644
--- a/tests/crate.scm
+++ b/tests/crate.scm
@@ -55,7 +55,7 @@
   \"dependencies\": [
      {
        \"crate_id\": \"bar\",
-       \"kind\": \"normal\",
+       \"kind\": \"normal\"
      }
   ]
 }")
@@ -87,20 +87,20 @@
   \"dependencies\": [
      {
        \"crate_id\": \"intermediate-1\",
-       \"kind\": \"normal\",
+       \"kind\": \"normal\"
      },
      {
        \"crate_id\": \"intermediate-2\",
-       \"kind\": \"normal\",
+       \"kind\": \"normal\"
      }
      {
        \"crate_id\": \"leaf-alice\",
-       \"kind\": \"normal\",
+       \"kind\": \"normal\"
      },
      {
        \"crate_id\": \"leaf-bob\",
-       \"kind\": \"normal\",
-     },
+       \"kind\": \"normal\"
+     }
   ]
 }")
 
@@ -131,15 +131,15 @@
   \"dependencies\": [
      {
        \"crate_id\": \"intermediate-2\",
-       \"kind\": \"normal\",
+       \"kind\": \"normal\"
      },
      {
        \"crate_id\": \"leaf-alice\",
-       \"kind\": \"normal\",
+       \"kind\": \"normal\"
      },
      {
        \"crate_id\": \"leaf-bob\",
-       \"kind\": \"normal\",
+       \"kind\": \"normal\"
      }
   ]
 }")
@@ -171,8 +171,8 @@
   \"dependencies\": [
      {
        \"crate_id\": \"leaf-bob\",
-       \"kind\": \"normal\",
-     },
+       \"kind\": \"normal\"
+     }
   ]
 }")
 
@@ -233,6 +233,7 @@
 (define test-source-hash
   "")
 
+
 (test-begin "crate")
 
 (test-equal "guix-package->crate-name"
diff --git a/tests/gem.scm b/tests/gem.scm
index 455fc15189..751bba656f 100644
--- a/tests/gem.scm
+++ b/tests/gem.scm
@@ -52,7 +52,7 @@
   \"homepage_uri\": \"https://example.com\",
   \"dependencies\": {
     \"runtime\": [
-      { \"name\": \"bundler\" },
+      { \"name\": \"bundler\" }
     ]
   },
   \"licenses\": null
diff --git a/tests/pypi.scm b/tests/pypi.scm
index 19af6e61fb..6788c8db3e 100644
--- a/tests/pypi.scm
+++ b/tests/pypi.scm
@@ -46,13 +46,13 @@
     \"1.0.0\": [
       {
         \"url\": \"https://example.com/foo-1.0.0.egg\",
-        \"packagetype\": \"bdist_egg\",
+        \"packagetype\": \"bdist_egg\"
       }, {
         \"url\": \"https://example.com/foo-1.0.0.tar.gz\",
-        \"packagetype\": \"sdist\",
+        \"packagetype\": \"sdist\"
       }, {
         \"url\": \"https://example.com/foo-1.0.0-py2.py3-none-any.whl\",
-        \"packagetype\": \"bdist_wheel\",
+        \"packagetype\": \"bdist_wheel\"
       }
     ]
   }
@@ -120,6 +120,7 @@ Provides-Extra: testing
 Requires-Dist: pytest (>=3.1.0); extra == 'testing'
 ")
 
+
 (test-begin "pypi")
 
 (test-equal "guix-package->pypi-name, old URL style"
-- 
cgit v1.2.3