Update test to get it working again.

diff --git a/tests/runtime/test-boyer-moore.scm b/tests/runtime/test-boyer-moore.scm
index fdd5c2a28cfd74eff9dfd40761d2223bd01e4fcb..392fd591dac69a607b4a2d2c47ad58418ea2a0bb 100644 (file)
--- a/tests/runtime/test-boyer-moore.scm
+++ b/tests/runtime/test-boyer-moore.scm
@@ -35,10 +35,12 @@ USA.
     (for-each
      (lambda (entry)
        (write-char #\+)
-       (let ((fr (string-search-forward text (car entry)))
-            (br (string-search-backward text (car entry))))
+       (let ((fr (string-search-forward (car entry) text))
+            (br (string-search-backward (car entry) text))
+             (all (string-search-all (car entry) text)))
         (if (and (eqv? (cadr entry) fr)
-                 (eqv? (fix:+ (car (last-pair entry)) die-length) br))
+                 (eqv? (fix:+ (last entry) die-length) br)
+                  (equal? (cdr entry) all))
             (begin
               (set! ok (fix:+ ok 1))
               unspecific)
@@ -74,7 +76,15 @@ USA.
 (define (file->string filename)
   (call-with-input-file filename
     (lambda (port)
-      ((textual-port-operation port 'REST->STRING) port))))
+      (let ((builder (string-builder))
+            (buffer (make-string #x1000)))
+        (let loop ()
+          (let ((n (read-string! buffer port)))
+            (if (> n 0)
+                (begin
+                  (builder (substring buffer 0 n))
+                  (loop)))))
+        (builder 'immutable)))))
 \f
 (define (search-speed-test text die-length die-skew procedure n-repeats)
   (let ((entries (map car (dice-text text die-length die-skew))))