diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
| commit | 64de896a71a9ba3091259834077d54c0146bdab6 (patch) | |
| tree | da58cc584fcc42a2b04f692aa3b1ada4c8949f5e /tests/gexp.scm | |
| parent | 5247aab8d6a18a4081ab7caeddb4fc083bca1f6b (diff) | |
| parent | 6bfcb729268e0d20c6ae78224aef0eaad2ee2e74 (diff) | |
| download | guix-patches-64de896a71a9ba3091259834077d54c0146bdab6.tar guix-patches-64de896a71a9ba3091259834077d54c0146bdab6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/gexp.scm')
| -rw-r--r-- | tests/gexp.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm index 23904fce2e..460afe7f59 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -849,8 +849,9 @@ #:effective-version "2.0"))) (define (matching-input drv output) (lambda (input) - (and (eq? (gexp-input-thing input) drv) - (string=? (gexp-input-output input) output)))) + (and (eq? (derivation-input-derivation input) drv) + (equal? (derivation-input-sub-derivations input) + (list output))))) (mbegin %store-monad (return (and (find (matching-input extension-drv "out") @@ -867,7 +868,8 @@ "/lib/guile/2.0/site-ccache") (lowered-gexp-load-compiled-path lexp)) (= 2 (length (lowered-gexp-load-compiled-path lexp))) - (eq? (lowered-gexp-guile lexp) (%guile-for-build))))))) + (eq? (derivation-input-derivation (lowered-gexp-guile lexp)) + (%guile-for-build))))))) (test-assertm "gexp->derivation #:references-graphs" (mlet* %store-monad |