[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: graph: Adjust test for glibc:static among the implicit inputs.
From: |
Ludovic Courtès |
Subject: |
01/01: graph: Adjust test for glibc:static among the implicit inputs. |
Date: |
Sun, 17 Dec 2017 16:29:50 -0500 (EST) |
civodul pushed a commit to branch core-updates
in repository guix.
commit cafc97e2f37f18e106c9a9cb9110a1862e9d0526
Author: Ludovic Courtès <address@hidden>
Date: Sun Dec 17 22:27:21 2017 +0100
graph: Adjust test for glibc:static among the implicit inputs.
Fixes <https://bugs.gnu.org/29612>.
Reported by Chris Marusich <address@hidden>.
This is a followup to 6dff905e51202bbdebbad8811b6509584d12a796.
* tests/graph.scm ("bag-emerged DAG"): Adjust for glibc:static among
IMPLICIT.
---
tests/graph.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tests/graph.scm b/tests/graph.scm
index 6431c48..00fd372 100644
--- a/tests/graph.scm
+++ b/tests/graph.scm
@@ -110,19 +110,23 @@ edges."
(text-file "foo" "bar")))))
(p (dummy-package "p" (source o)))
(implicit (map (match-lambda
- ((label package) package))
+ ((label package) package)
+ ((label package output) package))
(standard-packages))))
(run-with-store %store
(export-graph (list p) 'port
#:node-type %bag-emerged-node-type
#:backend backend))
;; We should see exactly P and IMPLICIT, with one edge from P to each
- ;; element of IMPLICIT. O must not appear among NODES.
+ ;; element of IMPLICIT. O must not appear among NODES. Note: IMPLICIT
+ ;; contains "glibc" twice, once for "out" and a second time for
+ ;; "static", hence the 'delete-duplicates' call below.
(let-values (((nodes edges) (nodes+edges)))
(and (equal? (match nodes
(((labels names) ...)
names))
- (map package-full-name (cons p implicit)))
+ (map package-full-name
+ (cons p (delete-duplicates implicit))))
(equal? (match edges
(((sources destinations) ...)
(zip (map store-path-package-name sources)