aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2020-02-27 21:14:34 +0000
committerChristopher Baines <mail@cbaines.net>2020-02-27 21:14:34 +0000
commitb166177dbd3d50555338a9aef46b12a1d4b75be6 (patch)
treeddca1d289486f56754f6c5560364425af7315e30
parentf4922fc904fb0e17b4e4fb52040ff745af55acae (diff)
downloaddata-service-b166177dbd3d50555338a9aef46b12a1d4b75be6.tar
data-service-b166177dbd3d50555338a9aef46b12a1d4b75be6.tar.gz
Prevent inlining for a number of procedures
So that the load-new-guix-revision tests work with Guile 3.
-rw-r--r--guix-data-service/jobs/load-new-guix-revision.scm10
1 files changed, 10 insertions, 0 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 7b54c66..bd331ab 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -915,6 +915,8 @@ WHERE job_id = $1"
derivation-file-names-by-system))
+(prevent-inlining-for-tests channel->derivations-by-system)
+
(define (channel-derivations-by-system->guix-store-item
store
channel-derivations-by-system)
@@ -939,6 +941,8 @@ WHERE job_id = $1"
(derivation->output-path derivation-for-current-system)))
#f)))
+(prevent-inlining-for-tests channel-derivations-by-system->guix-store-item)
+
(define (glibc-locales-for-guix-store-path store store-path)
(let ((inf (if (defined?
'open-inferior/container
@@ -1134,6 +1138,8 @@ WHERE job_id = $1"
(lambda (key . args)
(display-backtrace (make-stack #t) (current-error-port))))))
+(prevent-inlining-for-tests extract-information-from)
+
(define (update-package-versions-table conn git-repository-id commit)
(with-time-logging "lock table: package_versions_by_guix_revision_range"
;; Lock the table to wait for other transactions to commit before updating
@@ -1517,6 +1523,8 @@ SKIP LOCKED")
(f store)))
+(prevent-inlining-for-tests with-store-connection)
+
(define (setup-logging id thunk)
(let* ((previous-output-port (current-output-port))
(previous-error-port (current-error-port))
@@ -1548,6 +1556,8 @@ SKIP LOCKED")
(set-current-error-port previous-error-port)
result))
+(prevent-inlining-for-tests setup-logging)
+
(define (process-load-new-guix-revision-job id)
(with-postgresql-connection
(simple-format #f "load-new-guix-revision ~A" id)