From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 30 May 2010 11:09:06 +0000 (-0700)
Subject: Update to use new test framework.
X-Git-Tag: 20100708-Gtk~50
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=5f2cb0c59a351ebf34836edeecd39a8eaba8ac19;p=mit-scheme.git

Update to use new test framework.
---

diff --git a/tests/runtime/test-regsexp.scm b/tests/runtime/test-regsexp.scm
index 1b7bb04d4..be92a3f3d 100644
--- a/tests/runtime/test-regsexp.scm
+++ b/tests/runtime/test-regsexp.scm
@@ -31,15 +31,15 @@ USA.
   (regsexp-match-string (compile-regsexp pattern) string))
 
 (define ((match-string-test pattern string expected))
-  (let ((thunk (lambda () (match-string pattern string)))
-	(expr `(match-string ',pattern ,string)))
-    (if (eq? expected 'PATTERN-ERROR)
-	(assert-error thunk
-		      (list condition-type:compile-regsexp)
-		      'EXPRESSION error)
-	(assert-equal (thunk)
-		      expected
-		      'EXPRESSION expr))))
+  (let ((thunk (lambda () (match-string pattern string))))
+    (run-sub-test
+     (lambda ()
+       (with-test-properties
+	   (lambda ()
+	     (if (eq? expected 'PATTERN-ERROR)
+		 (assert-error thunk (list condition-type:compile-regsexp))
+		 (assert-equal (thunk) expected)))
+	 'EXPRESSION `(match-string ',pattern ,string))))))
 
 (define (match-strings-test pattern entries)
   (map (lambda (p)