From 8e1395be5c7d1a6e895fb5b1e70bebc0fef161a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 31 Aug 2018 17:23:38 +0200
Subject: [PATCH] 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 1f11648e2c..98f3c8fef0 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 80e08a9a5f..09ada70c2d 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")