[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: records: Adjust to test changes in 'record-abi-mismatch-error'.
From: |
Ludovic Courtès |
Subject: |
01/02: records: Adjust to test changes in 'record-abi-mismatch-error'. |
Date: |
Fri, 31 Aug 2018 11:27:02 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 8e1395be5c7d1a6e895fb5b1e70bebc0fef161a6
Author: Ludovic Courtès <address@hidden>
Date: Fri Aug 31 17:23:38 2018 +0200
records: Adjust to test changes in 'record-abi-mismatch-error'.
Fixes a test failure introduced in
de5cbd4a38a33e0412f1c481fe8e01a871dc13e5.
* guix/records.scm (abi-check): Refer to TYPE in an unquoted context so
we get at the RTD.
* tests/records.scm ("ABI checks"): Adjust 'catch' handler to changes
in the 'record-abi-mismatch-error' arguments.
---
guix/records.scm | 2 +-
tests/records.scm | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/guix/records.scm b/guix/records.scm
index 1f11648..98f3c8f 100644
--- a/guix/records.scm
+++ b/guix/records.scm
@@ -74,7 +74,7 @@ interface\" (ABI) for TYPE is equal to COOKIE."
;; recompiled.
(throw 'record-abi-mismatch-error 'abi-check
"~a: record ABI mismatch; recompilation needed"
- '(#,type) '())))))
+ (list #,type) '())))))
(define-syntax make-syntactic-constructor
(syntax-rules ()
diff --git a/tests/records.scm b/tests/records.scm
index 80e08a9..09ada70 100644
--- a/tests/records.scm
+++ b/tests/records.scm
@@ -313,8 +313,9 @@
(lambda ()
(eval '(foo? (make-me-a-record)) module)
#f)
- (lambda (key rtd . _)
- (eq? rtd (eval '<foo> module))))))
+ (match-lambda*
+ ((key 'abi-check (? string? message) (rtd) . _)
+ (eq? rtd (eval '<foo> module)))))))
(test-equal "recutils->alist"
'((("Name" . "foo")