05/06: squash! build-system: Rewrite using gexps

[guix-commits]

civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.

commit b81655a970f3660722d21ac455c7bec57b3fa7c9
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Mar 5 11:32:03 2021 +0100

    squash! build-system: Rewrite using gexps
    
    * tests/packages.scm ("package->bag, sensitivity to
    %current-target-system"): Change 'build' to match the new build system
    signature.
---
 tests/builders.scm | 18 ------------------
 tests/packages.scm | 10 +++++-----
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/tests/builders.scm b/tests/builders.scm
index 62ff991..f36a8c9 100644
--- a/tests/builders.scm
+++ b/tests/builders.scm
@@ -190,23 +190,5 @@ setup(
              python-dummy-fail-requirements
              python-dummy-fail-import
              python-dummy-fail-console-script)))
-(when (or (not (network-reachable?)) (shebang-too-long?))
-  (test-skip 1))
-
-(test-assert "gnu-build"
-  (let* ((url      "http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz";)
-         (hash     (nix-base32-string->bytevector
-                    "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"))
-         (tarball  (url-fetch* %store url 'sha256 hash
-                               #:guile %bootstrap-guile))
-         (build    ((store-lower gnu-build) %store "hello-2.8"
-                    (%bootstrap-inputs)
-                    #:source tarball
-                    #:guile %bootstrap-guile
-                    #:search-paths %bootstrap-search-paths))
-         (out      (derivation->output-path build)))
-    (and (build-derivations %store (list (pk 'hello-drv build)))
-         (valid-path? %store out)
-         (file-exists? (string-append out "/bin/hello")))))
 
 (test-end "builders")
diff --git a/tests/packages.scm b/tests/packages.scm
index 747f844..f68b078 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -1170,11 +1170,11 @@
                        (bag (name name) (system system) (target target)
                             (build-inputs native-inputs)
                             (host-inputs inputs)
-                            (build (lambda* (store name inputs
-                                                   #:key system target
-                                                   #:allow-other-keys)
-                                     (build-expression->derivation
-                                      store "foo" '(mkdir %output))))))))
+                            (build (lambda* (name inputs
+                                                  #:key system target
+                                                  #:allow-other-keys)
+                                     (gexp->derivation "foo"
+                                                       #~(mkdir 
#$output))))))))
          (bs    (build-system
                   (name 'build-system-without-cross-compilation)
                   (description "Does not support cross compilation.")