From bf41c6ebb1c12ec15ee77e727a1ae0d7a1466aef Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 28 Feb 2023 10:41:40 +0000 Subject: Set current-guix-package when computing system test derivations This is a bit ugly, but might speed up computing derivations for system tests. --- tests/jobs-load-new-guix-revision.scm | 42 +++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 17 deletions(-) (limited to 'tests') diff --git a/tests/jobs-load-new-guix-revision.scm b/tests/jobs-load-new-guix-revision.scm index 0f40e52..0eaad3f 100644 --- a/tests/jobs-load-new-guix-revision.scm +++ b/tests/jobs-load-new-guix-revision.scm @@ -37,12 +37,14 @@ (mock ((guix-data-service jobs load-new-guix-revision) - channel->derivations-by-system + channel->source-and-derivations-by-system (lambda (conn store channel fetch-with-authentication?) - '(("x86_64-linux" - . - ((manifest-entry-item . "/gnu/store/foo.drv") - (profile . "/gnu/store/bar.drv")))))) + (cons + "/gnu/store/guix" + '(("x86_64-linux" + . + ((manifest-entry-item . "/gnu/store/foo.drv") + (profile . "/gnu/store/bar.drv"))))))) (mock ((guix-data-service jobs load-new-guix-revision) @@ -59,7 +61,8 @@ (mock ((guix-data-service jobs load-new-guix-revision) extract-information-from - (lambda* (conn store guix-revision-id commit store-path + (lambda* (conn store guix-revision-id commit + guix-source store-path #:key skip-system-tests?) #t)) @@ -96,12 +99,14 @@ (mock ((guix-data-service jobs load-new-guix-revision) - channel->derivations-by-system + channel->source-and-derivations-by-system (lambda (conn store channel fetch-with-authentication?) - '(("x86_64-linux" - . - ((manifest-entry-item . "/gnu/store/foo.drv") - (profile . "/gnu/store/bar.drv")))))) + (cons + "/gnu/store/guix" + '(("x86_64-linux" + . + ((manifest-entry-item . "/gnu/store/foo.drv") + (profile . "/gnu/store/bar.drv"))))))) (mock ((guix-data-service jobs load-new-guix-revision) @@ -142,12 +147,14 @@ (mock ((guix-data-service jobs load-new-guix-revision) - channel->derivations-by-system + channel->source-and-derivations-by-system (lambda (conn store channel fetch-with-authentication?) - '(("x86_64-linux" - . - ((manifest-entry-item . "/gnu/store/foo.drv") - (profile . "/gnu/store/bar.drv")))))) + (cons + "/gnu/store/guix" + '(("x86_64-linux" + . + ((manifest-entry-item . "/gnu/store/foo.drv") + (profile . "/gnu/store/bar.drv"))))))) (mock ((guix-data-service jobs load-new-guix-revision) @@ -171,7 +178,8 @@ (mock ((guix-data-service jobs load-new-guix-revision) extract-information-from - (lambda* (conn store git-repository-id commit store-path + (lambda* (conn store git-repository-id commit + guix-source store-path #:key skip-system-tests?) #f)) -- cgit v1.2.3