aboutsummaryrefslogtreecommitdiff
path: root/tests/test
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2022-03-07 22:55:14 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2022-03-07 22:55:35 +0100
commit57e4004ec1a0489e6d8bc7dbd4bd07b110b6239b (patch)
tree119fc86cce7dddc174d71bbc125d9cc4ac0ed40e /tests/test
parentHandle broken symlink when generating static HTML. (diff)
downloadcalp-57e4004ec1a0489e6d8bc7dbd4bd07b110b6239b.tar.gz
calp-57e4004ec1a0489e6d8bc7dbd4bd07b110b6239b.tar.xz
Replace Guile's srfi-64:s test-error with working version.
Along with updating now failing tests.
Diffstat (limited to 'tests/test')
-rw-r--r--tests/test/let-env.scm1
-rw-r--r--tests/test/param.scm4
-rw-r--r--tests/test/recurrence-simple.scm3
-rw-r--r--tests/test/util.scm1
-rw-r--r--tests/test/vcomponent-formats-common-types.scm1
5 files changed, 8 insertions, 2 deletions
diff --git a/tests/test/let-env.scm b/tests/test/let-env.scm
index 1d6d7507..07b92d2d 100644
--- a/tests/test/let-env.scm
+++ b/tests/test/let-env.scm
@@ -1,5 +1,6 @@
(define-module (test let-env)
:use-module (srfi srfi-64)
+ :use-module (srfi srfi-64 test-error)
:use-module (srfi srfi-88)
:use-module ((guile) :select (setenv getenv))
:use-module ((hnh util) :select (let-env)))
diff --git a/tests/test/param.scm b/tests/test/param.scm
index 8b8a010d..4c3cbcfb 100644
--- a/tests/test/param.scm
+++ b/tests/test/param.scm
@@ -5,6 +5,7 @@
(define-module (test param)
:use-module (srfi srfi-64)
+ :use-module (srfi srfi-64 test-error)
:use-module (srfi srfi-88)
:use-module ((vcomponent base)
:select (param prop* parameters prop))
@@ -45,7 +46,8 @@ END:DUMMY"
(call-with-input-string
"BEGIN:DUMMY
KEY:Some Text
-END:DUMMY"))
+END:DUMMY"
+ parse-calendar))
;; Similar thing happens for sxcal, but during serialization instead
(let ((component (make-vcomponent 'DUMMY)))
diff --git a/tests/test/recurrence-simple.scm b/tests/test/recurrence-simple.scm
index 0f421b05..6ded68ba 100644
--- a/tests/test/recurrence-simple.scm
+++ b/tests/test/recurrence-simple.scm
@@ -6,6 +6,7 @@
(define-module (test recurrence-simple)
:use-module (srfi srfi-64)
+ :use-module (srfi srfi-64 test-error)
:use-module (srfi srfi-88)
:use-module ((srfi srfi-41)
:select (stream-take stream-map stream->list stream-car))
@@ -33,7 +34,7 @@
;;; Test that recurrence rule parsing fails where appropriate
(parameterize ((warnings-are-errors #t)
- (warning-handler identity))
+ (warning-handler (lambda _ "")))
(test-error "Invalid FREQ"
'warning
(parse-recurrence-rule "FREQ=ERR;COUNT=3"))
diff --git a/tests/test/util.scm b/tests/test/util.scm
index 47edb225..7cba2142 100644
--- a/tests/test/util.scm
+++ b/tests/test/util.scm
@@ -4,6 +4,7 @@
(define-module (test util)
:use-module (srfi srfi-64)
+ :use-module (srfi srfi-64 test-error)
:use-module (srfi srfi-88)
:use-module ((hnh util)
:select (filter-sorted
diff --git a/tests/test/vcomponent-formats-common-types.scm b/tests/test/vcomponent-formats-common-types.scm
index c8bfd323..4c442461 100644
--- a/tests/test/vcomponent-formats-common-types.scm
+++ b/tests/test/vcomponent-formats-common-types.scm
@@ -1,5 +1,6 @@
(define-module (test vcomponent-formats-common-types)
:use-module (srfi srfi-64)
+ :use-module (srfi srfi-64 test-error)
:use-module (srfi srfi-88)
:use-module ((vcomponent formats common types)
:select (get-parser))