Relocated test library

Makefile

@@ -68,12 +68,12 @@ install : libs install-libs install-includes install-bin
 	$(INSTALL) -m0755 scheme/*.so $(DESTDIR)$(DATADIR)/scheme
 	$(INSTALL) -m0644 scheme/cyclone/*.sld $(DESTDIR)$(DATADIR)/scheme/cyclone
 	$(INSTALL) -m0644 scheme/cyclone/*.scm $(DESTDIR)$(DATADIR)/scheme/cyclone
-	$(INSTALL) -m0644 scheme/cyclone/test.meta $(DESTDIR)$(DATADIR)/scheme/cyclone
+	$(INSTALL) -m0644 libs/cyclone/test.meta $(DESTDIR)$(DATADIR)/cyclone
 	$(INSTALL) -m0644 libs/cyclone/match.meta $(DESTDIR)$(DATADIR)/cyclone
 	$(INSTALL) -m0644 scheme/cyclone/*.o $(DESTDIR)$(DATADIR)/scheme/cyclone
 	$(INSTALL) -m0755 scheme/cyclone/*.so $(DESTDIR)$(DATADIR)/scheme/cyclone
 	$(INSTALL) -m0644 libs/cyclone/*.sld $(DESTDIR)$(DATADIR)/cyclone
-#	$(INSTALL) -m0644 libs/cyclone/*.scm $(DESTDIR)$(DATADIR)/cyclone
+	$(INSTALL) -m0644 libs/cyclone/*.scm $(DESTDIR)$(DATADIR)/cyclone
 	$(INSTALL) -m0644 libs/cyclone/*.o $(DESTDIR)$(DATADIR)/cyclone
 	$(INSTALL) -m0755 libs/cyclone/*.so $(DESTDIR)$(DATADIR)/cyclone
 	$(INSTALL) -m0644 srfi/*.sld $(DESTDIR)$(DATADIR)/srfi
@@ -261,9 +261,9 @@ bootstrap : icyc libs
 	cp scheme/cyclone/transforms.c $(BOOTSTRAP_DIR)/scheme/cyclone
 	cp scheme/cyclone/cgen.c $(BOOTSTRAP_DIR)/scheme/cyclone
 	cp scheme/cyclone/util.c $(BOOTSTRAP_DIR)/scheme/cyclone
-	cp scheme/cyclone/test.c $(BOOTSTRAP_DIR)/scheme/cyclone
-	cp scheme/cyclone/test.meta $(BOOTSTRAP_DIR)/scheme/cyclone
-	cp scheme/cyclone/test.scm $(BOOTSTRAP_DIR)/scheme/cyclone
+	cp libs/cyclone/test.c $(BOOTSTRAP_DIR)/cyclone
+	cp libs/cyclone/test.meta $(BOOTSTRAP_DIR)/cyclone
+	cp libs/cyclone/test.scm $(BOOTSTRAP_DIR)/cyclone
 	cp scheme/cyclone/array-list.c $(BOOTSTRAP_DIR)/scheme/cyclone
 	cp scheme/cyclone/array-list.meta $(BOOTSTRAP_DIR)/scheme/cyclone
 	cp scheme/cyclone/array-list.sld $(BOOTSTRAP_DIR)/scheme/cyclone #just in case

docs/API.md

@@ -58,9 +58,9 @@ These libraries are provided by Cyclone with a stable API that is unlikely to ch
 
 - [`cyclone concurrent`](api/cyclone/concurrent.md)
 - [`cyclone match`](api/cyclone/match.md)
+- [`cyclone test`](api/cyclone/test.md)
 - [`scheme cyclone array-list`](api/scheme/cyclone/array-list.md)
 - [`scheme cyclone pretty-print`](api/scheme/cyclone/pretty-print.md)
-- [`scheme cyclone test`](api/scheme/cyclone/test.md)
 
 # Internal Compiler API
 

libs/cyclone/test.sld

@@ -4,7 +4,7 @@
 ;;;; This module contains a testing framework ported from (chibi test)
 ;;;; which in turn was ported from CHICKEN.
 ;;;;
-(define-library (scheme cyclone test)
+(define-library (cyclone test)
   (export
    warning test-group-inc! print-exception ;; TODO: should not be needed here
                          ;; must be a problem with referential transparency

srfi/comparators/comparators-test.scm

@@ -1,4 +1,4 @@
-(import (scheme base) (scheme cyclone test) (scheme write) (srfi 128) #;(comparators))
+(import (scheme base) (cyclone test) (scheme write) (srfi 128) #;(comparators))
 ;(load "../comparators/r7rs-shim.scm")
 
 (define (print x) (display x) (newline))

srfi/list-queues/list-queues-test.scm

@@ -1,4 +1,4 @@
-(import (scheme base) (scheme cyclone test) (srfi 117))
+(import (scheme base) (cyclone test) (srfi 117))
 ;(cond-expand
 ;  (chicken (use test srfi-117))
 ;  (chibi (import (chibi test) (list-queues)))

srfi/sets/sets-test.scm

@@ -2,7 +2,7 @@
   (scheme base) 
   (scheme char)
   (scheme complex)
-  (scheme cyclone test)
+  (cyclone test)
   (srfi 113)
   (srfi 128)
 )

srfi/vectors/vectors-test.scm

@@ -1,6 +1,6 @@
-(import (scheme base) (srfi 133) (scheme cyclone test))
+(import (scheme base) (srfi 133) (cyclone test))
 #;(cond-expand
-  (cyclone (import (scheme base) (srfi 133) (scheme cyclone test)))
+  (cyclone (import (scheme base) (srfi 133) (cyclone test)))
   (chicken (use test srfi-133))
   (chibi (import (scheme base) (chibi test) (vectors))))
 (test-group "vectors"

tests/array-list-tests.scm

@@ -24,7 +24,7 @@
   (scheme base)
   (srfi 27)
   (scheme cyclone array-list)
-  (scheme cyclone test))
+  (cyclone test))
 
 (define test-size 2000)
 

tests/macro-hygiene.scm

@@ -1,7 +1,7 @@
 (import 
   (scheme base) 
   (scheme write) 
-  (scheme cyclone test)
+  (cyclone test)
   (scheme cyclone pretty-print))
 
 (define (output sexp)

tests/match-tests.scm

@@ -6,7 +6,7 @@
   (cyclone
     (import
       (cyclone match)
-      (scheme cyclone test)))
+      (cyclone test)))
   (chibi
     (import
       (chibi ast)

tests/srfi-121-tests.scm

@@ -23,7 +23,7 @@
   (scheme base)
   (srfi 121)
   (only (srfi 1) unfold)
-  (scheme cyclone test))
+  (cyclone test))
 
 (define g
   (make-coroutine-generator

tests/srfi-143-tests.scm

@@ -1,4 +1,4 @@
-(import (scheme base)) (import (srfi 143)) (import (scheme cyclone test))
+(import (scheme base)) (import (srfi 143)) (import (cyclone test))
 (test-group "fixnum"
 (test-group "fixnum/arithmetic"
   (test #t (fixnum? 32767))

tests/srfi-28-tests.scm

@@ -1,7 +1,7 @@
 (import
   (scheme base)
   (srfi 28)
-  (scheme cyclone test))
+  (cyclone test))
 
 (test-group
   "format"

tests/srfi-60-tests.scm

@@ -22,7 +22,7 @@
 (import 
   (scheme base)
   (srfi 60)
-  (scheme cyclone test))
+  (cyclone test))
 
 (define a #b1100)
 (define b #b1010)