diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-07-01 23:25:59 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-07-01 23:29:16 +0200 |
| commit | bee2c369fa2a3d51e6a1218d1b1a0ee86528674a (patch) | |
| tree | 49f17500cef4557adc1d1fdb7b0c4915ccc42ece /tests/graph.scm | |
| parent | 4ff12d1de7cd617b791996ee7ca1240660b4c20e (diff) | |
tests: Adjust 'guix graph' test to latest OCaml changes.
* tests/graph.scm ("reverse bag DAG"): Adjust to latest OCaml changes by
looking at dune/ocaml-camomile/ocaml-utop.
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 baa08a6be2b..6aa2d0e0ffb 100644 --- a/tests/graph.scm +++ b/tests/graph.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2015-2022 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; | 3 | ;;; |
| 4 | ;;; This file is part of GNU Guix. | 4 | ;;; This file is part of GNU Guix. |
| 5 | ;;; | 5 | ;;; |
| @@ -244,10 +244,10 @@ edges." | |||
| 244 | edges))))))))) | 244 | edges))))))))) |
| 245 | 245 | ||
| 246 | (test-assert "reverse bag DAG" | 246 | (test-assert "reverse bag DAG" |
| 247 | (let-values (((dune bap ocaml-base) | 247 | (let-values (((dune camomile utop) |
| 248 | (values (specification->package "ocaml4.07-dune") | 248 | (values (specification->package "dune") |
| 249 | (specification->package "bap") | 249 | (specification->package "ocaml-camomile") |
| 250 | (specification->package "ocaml4.07-base"))) | 250 | (specification->package "ocaml-utop"))) |
| 251 | ((backend nodes+edges) (make-recording-backend))) | 251 | ((backend nodes+edges) (make-recording-backend))) |
| 252 | (run-with-store %store | 252 | (run-with-store %store |
| 253 | (export-graph (list dune) 'port | 253 | (export-graph (list dune) 'port |
| @@ -256,17 +256,17 @@ edges." | |||
| 256 | 256 | ||
| 257 | (run-with-store %store | 257 | (run-with-store %store |
| 258 | (mlet %store-monad ((dune-drv (package->derivation dune)) | 258 | (mlet %store-monad ((dune-drv (package->derivation dune)) |
| 259 | (bap-drv (package->derivation bap)) | 259 | (camomile-drv (package->derivation camomile)) |
| 260 | (ocaml-base-drv (package->derivation ocaml-base))) | 260 | (utop-drv (package->derivation utop))) |
| 261 | ;; OCAML-BASE uses 'dune-build-system' so DUNE is a direct dependency. | 261 | ;; CAMOMILE uses 'dune-build-system' so DUNE is a direct dependency. |
| 262 | ;; BAP is much higher in the stack but it should be there. | 262 | ;; UTOP is much higher in the stack but it should be there. |
| 263 | (let-values (((nodes edges) (nodes+edges))) | 263 | (let-values (((nodes edges) (nodes+edges))) |
| 264 | (return | 264 | (return |
| 265 | (and (member `(,(derivation-file-name bap-drv) | 265 | (and (member `(,(derivation-file-name camomile-drv) |
| 266 | ,(package-full-name bap)) | 266 | ,(package-full-name camomile)) |
| 267 | nodes) | 267 | nodes) |
| 268 | (->bool (member (map derivation-file-name | 268 | (->bool (member (map derivation-file-name |
| 269 | (list dune-drv ocaml-base-drv)) | 269 | (list dune-drv utop-drv)) |
| 270 | edges))))))))) | 270 | edges))))))))) |
| 271 | 271 | ||
| 272 | (test-assert "derivation DAG" | 272 | (test-assert "derivation DAG" |
