Move util modules into calp module..

11 files changed, 11 insertions, 11 deletions

diff --git a/tests/datetime.scm b/tests/datetime.scm
index 73b7ce65..83750472 100644
--- a/tests/datetime.scm
+++ b/tests/datetime.scm
@@ -10,7 +10,7 @@
   leap-year?
   )
  ((ice-9 format) format)
- ((util) let*)
+ ((calp util) let*)
  )
 
 (test-equal "empty time"
diff --git a/tests/let.scm b/tests/let.scm
index 14a246d2..82919b49 100644
--- a/tests/let.scm
+++ b/tests/let.scm
@@ -1,4 +1,4 @@
-(((util) let*)
+(((calp util) let*)
  ((guile) set!))
 
 (test-assert (let* ((a #t)) a))
diff --git a/tests/param.scm b/tests/param.scm
index ad690e61..0c4190dd 100644
--- a/tests/param.scm
+++ b/tests/param.scm
@@ -1,6 +1,6 @@
 (((vcomponent base) param prop* parameters)
  ((vcomponent parse) parse-calendar)
- ((util) sort*))
+ ((calp util) sort*))
 
 (define v (call-with-input-string
               "BEGIN:DUMMY
diff --git a/tests/recurrence.scm b/tests/recurrence.scm
index e73aa836..6ced6af0 100644
--- a/tests/recurrence.scm
+++ b/tests/recurrence.scm
@@ -12,7 +12,7 @@
  ((vcomponent base) make-vcomponent prop prop* extract)
  ((datetime) parse-ics-datetime datetime time date
   datetime->string)
- ((util) -> set!)
+ ((calp util) -> set!)
  ((srfi srfi-41) stream->list)
  ((srfi srfi-88) keyword->string))
 
diff --git a/tests/rrule-parse.scm b/tests/rrule-parse.scm
index f1d02d27..b7a851a0 100644
--- a/tests/rrule-parse.scm
+++ b/tests/rrule-parse.scm
@@ -2,7 +2,7 @@
   parse-recurrence-rule)
  ((vcomponent recurrence) make-recur-rule)
  ((datetime) mon)
- ((util exceptions) warnings-are-errors warning-handler)
+ ((calp util exceptions) warnings-are-errors warning-handler)
  )
 
 (test-equal (make-recur-rule freq: 'HOURLY wkst: mon interval: 1)
diff --git a/tests/run-tests.scm b/tests/run-tests.scm
index b162522d..670a1784 100755
--- a/tests/run-tests.scm
+++ b/tests/run-tests.scm
@@ -17,7 +17,7 @@
              (ice-9 getopt-long)
              (srfi srfi-64)             ; test suite
              (srfi srfi-88)             ; suffix keywords
-             ((util) :select (for awhen))
+             ((calp util) :select (for awhen))
              ;; datetime introduces the reader extensions for datetimes,
              ;; which leaks into the sandboxes below.
              (datetime))
diff --git a/tests/termios.scm b/tests/termios.scm
index 3fed5da3..214a12a0 100755
--- a/tests/termios.scm
+++ b/tests/termios.scm
@@ -7,7 +7,7 @@
 
 ;;; Code:
 
-(((util) set!)
+(((calp util) set!)
  ((vulgar termios)
   make-termios copy-termios
   lflag
diff --git a/tests/tz.scm b/tests/tz.scm
index 321bb960..8ccd636d 100644
--- a/tests/tz.scm
+++ b/tests/tz.scm
@@ -4,7 +4,7 @@
   datetime->unix-time
   unix-time->datetime
   get-datetime)
- ((util) let-env))
+ ((calp util) let-env))
 
 ;; London alternates between +0000 and +0100
 (let-env ((TZ "Europe/London"))
diff --git a/tests/util.scm b/tests/util.scm
index 6ad58a24..f917b5ce 100644
--- a/tests/util.scm
+++ b/tests/util.scm
@@ -1,4 +1,4 @@
-(((util) filter-sorted set/r!))
+(((calp util) filter-sorted set/r!))
 
 (test-equal "Filter sorted"
   '(3 4 5)
diff --git a/tests/web-server.scm b/tests/web-server.scm
index 49092607..6b315319 100644
--- a/tests/web-server.scm
+++ b/tests/web-server.scm
@@ -2,7 +2,7 @@
  ((web server) run-server)
  ((ice-9 threads) call-with-new-thread cancel-thread)
  ((web client) http-get)
- ((util) let*)
+ ((calp util) let*)
  ((web response) response-code response-location)
  ((web uri) build-uri uri-path)
  ((guile) AF_INET))
diff --git a/tests/xcal.scm b/tests/xcal.scm
index 0d4985df..1748cba3 100644
--- a/tests/xcal.scm
+++ b/tests/xcal.scm
@@ -1,7 +1,7 @@
 (((vcomponent xcal parse) sxcal->vcomponent)
  ((vcomponent xcal output) vcomponent->sxcal)
  ((vcomponent ical parse) parse-calendar)
- ((util) ->)
+ ((calp util) ->)
  ((vcomponent base)
   parameters prop* children)
  )