diff options
| author | Marius Bakke <marius@gnu.org> | 2022-07-13 23:34:58 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-07-13 23:34:58 +0200 |
| commit | 4442a5db773f79e05c37e014c63b4298e7de666b (patch) | |
| tree | 880a6fdce7b288eaa506828b9b500191ca60ce24 /tests/graph.scm | |
| parent | 5b48591176a08bddfd0147bd854785fb4f6a62ba (diff) | |
| parent | b160795a0b65d67ff5d64447f1b97c2f009517a0 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'tests/graph.scm')
| -rw-r--r-- | tests/graph.scm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/graph.scm b/tests/graph.scm index baa08a6be2..6aa2d0e0ff 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015-2022 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -244,10 +244,10 @@ edges." edges))))))))) (test-assert "reverse bag DAG" - (let-values (((dune bap ocaml-base) - (values (specification->package "ocaml4.07-dune") - (specification->package "bap") - (specification->package "ocaml4.07-base"))) + (let-values (((dune camomile utop) + (values (specification->package "dune") + (specification->package "ocaml-camomile") + (specification->package "ocaml-utop"))) ((backend nodes+edges) (make-recording-backend))) (run-with-store %store (export-graph (list dune) 'port @@ -256,17 +256,17 @@ edges." (run-with-store %store (mlet %store-monad ((dune-drv (package->derivation dune)) - (bap-drv (package->derivation bap)) - (ocaml-base-drv (package->derivation ocaml-base))) - ;; OCAML-BASE uses 'dune-build-system' so DUNE is a direct dependency. - ;; BAP is much higher in the stack but it should be there. + (camomile-drv (package->derivation camomile)) + (utop-drv (package->derivation utop))) + ;; CAMOMILE uses 'dune-build-system' so DUNE is a direct dependency. + ;; UTOP is much higher in the stack but it should be there. (let-values (((nodes edges) (nodes+edges))) (return - (and (member `(,(derivation-file-name bap-drv) - ,(package-full-name bap)) + (and (member `(,(derivation-file-name camomile-drv) + ,(package-full-name camomile)) nodes) (->bool (member (map derivation-file-name - (list dune-drv ocaml-base-drv)) + (list dune-drv utop-drv)) edges))))))))) (test-assert "derivation DAG" |