From a59ad8b929371547f0a4df3f9722c60f4d05a53f Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@cs.indiana.edu>
Date: Thu, 18 Dec 2014 15:09:26 -0500
Subject: [PATCH] Move tests for SRFIs to "racket-test".

---
 pkgs/racket-test-core/tests/racket/list.rktl  |  5 ----
 .../racket-test-core/tests/racket/vector.rktl |  5 ----
 .../tests/racket/srfi-1-collide.rkt           |  3 +++
 .../tests/racket/srfi-14.rkt}                 | 27 ++++++++++---------
 4 files changed, 18 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/racket-test/tests/racket/srfi-1-collide.rkt
 rename pkgs/{racket-test-core/tests/racket/char-set.rktl => racket-test/tests/racket/srfi-14.rkt} (97%)

diff --git a/pkgs/racket-test-core/tests/racket/list.rktl b/pkgs/racket-test-core/tests/racket/list.rktl
index 0ca4b02d9d..2904637a6a 100644
--- a/pkgs/racket-test-core/tests/racket/list.rktl
+++ b/pkgs/racket-test-core/tests/racket/list.rktl
@@ -528,9 +528,4 @@
   (test '(20 19 18 17 16 15 14 13 12 11) range 20 10 -1)
   (test '(10 11.5 13.0 14.5) range 10 15 1.5))
 
-;; ---------- check no collisions with srfi/1 ----------
-(test (void)
-      eval '(module foo scheme/base (require scheme/base srfi/1/list))
-           (make-base-namespace))
-
 (report-errs)
diff --git a/pkgs/racket-test-core/tests/racket/vector.rktl b/pkgs/racket-test-core/tests/racket/vector.rktl
index e0e866ada9..b5f8c744a6 100644
--- a/pkgs/racket-test-core/tests/racket/vector.rktl
+++ b/pkgs/racket-test-core/tests/racket/vector.rktl
@@ -229,9 +229,4 @@
   (err/rt-test (vector-map (lambda (x) x) #() #() #()) (check-regs #rx"vector-map" #rx"mismatch between procedure arity")))
 
 
-;; ---------- check no collisions with srfi/43 ----------
-#;(test (void)
-      eval '(module foo scheme/base (require scheme/base srfi/43))
-           (make-base-namespace))
-
 (report-errs)
diff --git a/pkgs/racket-test/tests/racket/srfi-1-collide.rkt b/pkgs/racket-test/tests/racket/srfi-1-collide.rkt
new file mode 100644
index 0000000000..fcbb070a6e
--- /dev/null
+++ b/pkgs/racket-test/tests/racket/srfi-1-collide.rkt
@@ -0,0 +1,3 @@
+#lang racket/base
+;; ---------- check no collisions with srfi/1 ----------
+(require scheme/base srfi/1/list)
diff --git a/pkgs/racket-test-core/tests/racket/char-set.rktl b/pkgs/racket-test/tests/racket/srfi-14.rkt
similarity index 97%
rename from pkgs/racket-test-core/tests/racket/char-set.rktl
rename to pkgs/racket-test/tests/racket/srfi-14.rkt
index 3fd2af59ed..7266b7007f 100644
--- a/pkgs/racket-test-core/tests/racket/char-set.rktl
+++ b/pkgs/racket-test/tests/racket/srfi-14.rkt
@@ -1,10 +1,16 @@
+#lang racket/base
 
-(load-relative "loadtest.rktl")
-
-(Section 'char-set/srfi-14)
-
+(require rackunit)
 (require srfi/14/char-set)
 
+(define-syntax test
+  (syntax-rules ()
+    [(_ #t p? args ...) (check-true (p? args ...))]
+    [(_ #f p? args ...) (check-false (p? args ...))]
+    [(_ e args ...) (check-equal? e (args ...))]))
+
+(define-syntax-rule (err/rt-test e) (check-exn exn:fail? (λ () e)))
+
 ;; NOTE: tests assume that ! functions are actually functional
 
 ;; Check char sets ----------------------------------------
@@ -295,7 +301,8 @@
   )
 
 ;; ----------------------------------------
-  
+
+
 ;;; This is a regression testing suite for the SRFI-14 char-set library.
 ;;; Olin Shivers
 
@@ -304,9 +311,9 @@
 			 (begin (one-test tst) ...))))
 		(one-test (syntax-rules (let)
 			    ((_ (let . rest))
-			     (test #t 'let... (let . rest)))
+			     (check-true (let . rest)))
 			    ((_ (op arg ...))
-			     (test #t op arg ...)))))
+			     (check-true (op arg ...))))))
   (let ((vowel? (lambda (c) (member c '(#\a #\e #\i #\o #\u)))))
 
     (tests
@@ -504,8 +511,4 @@
 ;; ----------------------------------------
 
 ;; PR 8624 --- make sure there's no error:
-(test #t values (string? (char-set->string (char-set-complement char-set:graphic))))
-
-;; ----------------------------------------
-
-(report-errs)
+(check-true (string? (char-set->string (char-set-complement char-set:graphic))))
\ No newline at end of file