From 83d603d1512cbf284029ccb98ae9920b0fdc0053 Mon Sep 17 00:00:00 2001
From: Peter Bex <peter@more-magic.net>
Date: Tue, 6 Oct 2026 08:35:07 +0200
Subject: Fix tests for C5

---
 tests/run.scm     | 11 ++++++++---
 tests/testlib.scm |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/run.scm b/tests/run.scm
index 6e6062d..ab796da 100644
--- a/tests/run.scm
+++ b/tests/run.scm
@@ -1,8 +1,13 @@
 (import test (chicken irregex) (chicken time) (chicken time posix)
-        (chicken file) (chicken bytevector) intarweb)
+        (chicken file) intarweb)
 
-;; Change this to (use spiffy) when compiling tests
-(load "../spiffy.scm")
+(cond-expand
+  (chicken-6 (import (chicken bytevector)))
+  (else (import (chicken blob) srfi-4)
+        (define (string->utf8 s)
+          (blob->u8vector/shared (string->blob s)))))
+
+;;(load "../spiffy.scm")
 (import spiffy)
 
 (test-begin "spiffy")
diff --git a/tests/testlib.scm b/tests/testlib.scm
index d124554..5de8a48 100644
--- a/tests/testlib.scm
+++ b/tests/testlib.scm
@@ -5,7 +5,7 @@
 
 (cond-expand
   (chicken-6)
-  (else (define read-bytevector read-string)))
+  (else (import srfi-4) (define read-bytevector read-u8vector)))
 
 (server-port (string->number
                (or (get-environment-variable "SPIFFY_TEST_PORT") "8080")))
-- 
cgit v1.2.3