Permalink
Browse files

reorganised the r6rs tests

  • Loading branch information...
1 parent 0b30945 commit 1fcfa6544fa819ff37eb8aa7ec1e29efa88adc47 @marcomaggi committed Jun 11, 2010
Showing with 327 additions and 345 deletions.
  1. +23 −14 README
  2. +3 −3 scheme/Makefile.am
  3. +146 −31 tests/Makefile.am
  4. +2 −2 tests/r6rs/arithmetic/bitwise.sls
  5. +2 −2 tests/r6rs/arithmetic/fixnums.sls
  6. +2 −2 tests/r6rs/arithmetic/flonums.sls
  7. +2 −2 tests/r6rs/base.sls
  8. +2 −2 tests/r6rs/bytevectors.sls
  9. +2 −2 tests/r6rs/conditions.sls
  10. +3 −3 tests/r6rs/contrib.sls
  11. +1 −1 tests/r6rs/contrib/helper1.sls
  12. +2 −2 tests/r6rs/control.sls
  13. +2 −2 tests/r6rs/enums.sls
  14. +2 −2 tests/r6rs/eval.sls
  15. +2 −2 tests/r6rs/exceptions.sls
  16. +2 −2 tests/r6rs/hashtables.sls
  17. +2 −2 tests/r6rs/io/ports.sls
  18. +2 −2 tests/r6rs/io/simple.sls
  19. +2 −2 tests/r6rs/lists.sls
  20. +2 −2 tests/r6rs/mutable-pairs.sls
  21. +2 −2 tests/r6rs/mutable-strings.sls
  22. +2 −2 tests/r6rs/programs.sls
  23. +2 −2 tests/r6rs/r5rs.sls
  24. +2 −2 tests/r6rs/reader.sls
  25. +2 −2 tests/r6rs/records/procedural.sls
  26. +2 −2 tests/r6rs/records/syntactic.sls
  27. +26 −26 tests/r6rs/run-via-eval.sps
  28. +26 −26 tests/r6rs/run.sps
  29. BIN tests/r6rs/run/_trunk_collects_tests_r6rs_run_files/logo.png
  30. +0 −142 tests/r6rs/run/_trunk_collects_tests_r6rs_run_files/svnindex.css
  31. +2 −2 tests/r6rs/run/arithmetic/bitwise.sps
  32. +2 −2 tests/r6rs/run/arithmetic/fixnums.sps
  33. +2 −2 tests/r6rs/run/arithmetic/flonums.sps
  34. +2 −2 tests/r6rs/run/base.sps
  35. +2 −2 tests/r6rs/run/bytevectors.sps
  36. +2 −2 tests/r6rs/run/conditions.sps
  37. +2 −2 tests/r6rs/run/contrib.sps
  38. +2 −2 tests/r6rs/run/control.sps
  39. +2 −2 tests/r6rs/run/enums.sps
  40. +2 −2 tests/r6rs/run/eval.sps
  41. +2 −2 tests/r6rs/run/exceptions.sps
  42. +2 −2 tests/r6rs/run/hashtables.sps
  43. +2 −2 tests/r6rs/run/io/ports.sps
  44. +2 −2 tests/r6rs/run/io/simple.sps
  45. +2 −2 tests/r6rs/run/lists.sps
  46. +2 −2 tests/r6rs/run/mutable-pairs.sps
  47. +2 −2 tests/r6rs/run/mutable-strings.sps
  48. +2 −2 tests/r6rs/run/programs.sps
  49. +2 −2 tests/r6rs/run/r5rs.sps
  50. +2 −2 tests/r6rs/run/reader.sps
  51. +2 −2 tests/r6rs/run/records/procedural.sps
  52. +2 −2 tests/r6rs/run/records/syntactic.sps
  53. +2 −2 tests/r6rs/run/sorting.sps
  54. +2 −2 tests/r6rs/run/syntax-case.sps
  55. +2 −2 tests/r6rs/run/unicode.sps
  56. +2 −2 tests/r6rs/sorting.sls
  57. +2 −2 tests/r6rs/syntax-case.sls
  58. +1 −1 tests/r6rs/test.sls
  59. +2 −2 tests/r6rs/unicode.sls
View
@@ -87,21 +87,33 @@ the files under a temporary location; example:
5. Testing
----------
-The original tests (from the Ikarus distribution) are executed running:
+The original tests (from the Ikarus distribution) are under the
+"scheme/tests" subdirectory and they are executed running:
- $ make check
+ $ make ikarus-tests
-the new tests added in Vicare are executed running:
+ The new tests added in Vicare are in the "tests" subdirectory and they
+are executed running:
$ make tests
-the following command will run all the R6RS compliance tests by Matthew
-Flatt:
+all the test files under "tests" are programs whose file name has the
+format "test-<name>.sps" where <name> is indicates of the tested
+feature; it is possible to select a single test file by using the "name"
+variable on the command line of "make"; for example:
+
+ $ make tests name=equal-hash
+
+will run the "test-equal-hash.sps" file. The "name" variable is used to
+expand a file name with wildcards as in "test-*$(name)*.sps".
+
+ The following command will run all the R6RS compliance tests by
+Matthew Flatt:
$ make test-r6rs
-in detail: each of the following rules will run a single set of R6RS
-compliance tests:
+whose files are in the "tests/r6rs" subdirectory; in detail: each of the
+following makefile rules will run a single set of R6RS compliance tests:
test-r6rs-arithmetic-bitwise test-r6rs-arithmetic-fixnums
test-r6rs-arithmetic-flonums test-r6rs-base
@@ -117,15 +129,12 @@ compliance tests:
test-r6rs-sorting test-r6rs-syntax-case
test-r6rs-unicode
- All the test files under "tests" are programs whose file name has the
-format "test-<name>.sps" where <name> is indicates of the tested
-feature; it is possible to select a single test file by using the "name"
-variable on the command line of "make"; for example:
+ The command:
- $ make tests name=equal-hash
+ $ make check
-will run the "test-equal-hash.sps" file. The "name" variable is used to
-expand a file name with wildcards as in "test-*$(name)*.sps".
+will run both the R6RS compliance tests and the Vicare tests under
+"tests".
6. Policy
View
@@ -133,9 +133,9 @@ $(NEW_BOOT_FILE): $(EXTRA_DIST) ikarus.config.ss
$(NEW_EXECUTABLE) -b $(srcdir)/ikarus.boot.$(sizeofvoidp).prebuilt \
--r6rs-script $(srcdir)/makefile.ss
-check: $(NEW_BOOT_FILE)
+ikarus-tests: $(NEW_BOOT_FILE)
IKARUS_SRC_DIR=$(srcdir) \
- VICARE_LIBRARY_PATH=$(srcdir) \
- $(NEW_EXECUTABLE) -b $(NEW_BOOT_FILE) --r6rs-script $(srcdir)/run-tests.ss
+ VICARE_LIBRARY_PATH=$(srcdir) \
+ $(NEW_EXECUTABLE) -b $(NEW_BOOT_FILE) --r6rs-script $(srcdir)/run-tests.ss
### end of file
View
@@ -1,9 +1,5 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST= checks.sls \
- test-equal-hash.sps \
- test-log.sps
-
testdir = $(srcdir)
VICARE_SELECTED_TESTS = $(wildcard $(testdir)/test-*$(name)*.sps)
@@ -12,8 +8,6 @@ VICARE_BOOT = $(builddir)/../scheme/vicare.boot
VICARE_FLAGS = -b $(VICARE_BOOT) --debug --r6rs-script
VICARE_ENV = VICARE_LIBRARY_PATH=$(srcdir):$(srcdir)/../lib
VICARE_RUN = $(VICARE_ENV) $(VICARE) $(VICARE_FLAGS)
-VICARE_R6RS_ENV = VICARE_LIBRARY_PATH=$(srcdir)/../tests:$(srcdir)/..:$(srcdir)/../lib
-VICARE_R6RS_RUN = $(VICARE_R6RS_ENV) $(VICARE) $(VICARE_FLAGS)
.PHONY: test tests test-r6rs
@@ -23,6 +17,7 @@ test tests:
@echo
## --------------------------------------------------------------------
+## Raw interface for Flatt's R6RS test suite.
vicare_r6rs_subtest_RULES = \
test-r6rs-control \
@@ -58,78 +53,198 @@ vicare_r6rs_subtest_RULES = \
test-r6rs: $(vicare_r6rs_subtest_RULES)
test-r6rs-control:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/control.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/control.sps
test-r6rs-base:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/base.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/base.sps
test-r6rs-io-ports:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/io/ports.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/io/ports.sps
test-r6rs-io-simple:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/io/simple.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/io/simple.sps
test-r6rs-eval:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/eval.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/eval.sps
test-r6rs-syntax-case:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/syntax-case.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/syntax-case.sps
test-r6rs-mutable-strings:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/mutable-strings.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/mutable-strings.sps
test-r6rs-records-procedural:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/records/procedural.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/records/procedural.sps
test-r6rs-records-syntactic:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/records/syntactic.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/records/syntactic.sps
test-r6rs-conditions:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/conditions.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/conditions.sps
test-r6rs-hashtables:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/hashtables.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/hashtables.sps
test-r6rs-programs:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/programs.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/programs.sps
test-r6rs-contrib:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/contrib.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/contrib.sps
test-r6rs-unicode:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/unicode.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/unicode.sps
test-r6rs-r5rs:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/r5rs.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/r5rs.sps
test-r6rs-reader:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/reader.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/reader.sps
test-r6rs-mutable-pairs:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/mutable-pairs.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/mutable-pairs.sps
test-r6rs-lists:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/lists.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/lists.sps
test-r6rs-arithmetic-fixnums:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/arithmetic/fixnums.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/arithmetic/fixnums.sps
test-r6rs-arithmetic-bitwise:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/arithmetic/bitwise.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/arithmetic/bitwise.sps
test-r6rs-arithmetic-flonums:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/arithmetic/flonums.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/arithmetic/flonums.sps
test-r6rs-bytevectors:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/bytevectors.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/bytevectors.sps
test-r6rs-exceptions:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/exceptions.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/exceptions.sps
test-r6rs-enums:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/enums.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/enums.sps
test-r6rs-sorting:
- @$(VICARE_R6RS_RUN) $(srcdir)/r6rs/run/sorting.sps
+ @$(VICARE_RUN) $(srcdir)/r6rs/run/sorting.sps
+
+## --------------------------------------------------------------------
+## Interface to "make check".
+
+TESTS_ENVIRONMENT = $(VICARE_RUN)
+TESTS = \
+ test-equal-hash.sps \
+ test-fxreverse-bit-field.sps \
+ test-getpid.sps \
+ test-log.sps \
+ \
+ test-issue-10.sps \
+ test-issue-12.sps \
+ test-issue-7.sps \
+ test-issue-8.sps \
+ test-issue-9.sps \
+ \
+ $(srcdir)/r6rs/run/control.sps \
+ $(srcdir)/r6rs/run/base.sps \
+ $(srcdir)/r6rs/run/io/ports.sps \
+ $(srcdir)/r6rs/run/io/simple.sps \
+ $(srcdir)/r6rs/run/eval.sps \
+ $(srcdir)/r6rs/run/syntax-case.sps \
+ $(srcdir)/r6rs/run/mutable-strings.sps \
+ $(srcdir)/r6rs/run/records/procedural.sps \
+ $(srcdir)/r6rs/run/records/syntactic.sps \
+ $(srcdir)/r6rs/run/conditions.sps \
+ $(srcdir)/r6rs/run/hashtables.sps \
+ $(srcdir)/r6rs/run/programs.sps \
+ $(srcdir)/r6rs/run/contrib.sps \
+ $(srcdir)/r6rs/run/unicode.sps \
+ $(srcdir)/r6rs/run/r5rs.sps \
+ $(srcdir)/r6rs/run/reader.sps \
+ $(srcdir)/r6rs/run/mutable-pairs.sps \
+ $(srcdir)/r6rs/run/lists.sps \
+ $(srcdir)/r6rs/run/arithmetic/fixnums.sps \
+ $(srcdir)/r6rs/run/arithmetic/bitwise.sps \
+ $(srcdir)/r6rs/run/arithmetic/flonums.sps \
+ $(srcdir)/r6rs/run/bytevectors.sps \
+ $(srcdir)/r6rs/run/exceptions.sps \
+ $(srcdir)/r6rs/run/enums.sps \
+ $(srcdir)/r6rs/run/sorting.sps
+
+## --------------------------------------------------------------------
+
+EXTRA_DIST = \
+ checks.sls \
+ r6rs \
+ r6rs/README.txt \
+ r6rs/arithmetic \
+ r6rs/arithmetic/bitwise.sls \
+ r6rs/arithmetic/fixnums.sls \
+ r6rs/arithmetic/flonums.sls \
+ r6rs/base.sls \
+ r6rs/bytevectors.sls \
+ r6rs/conditions.sls \
+ r6rs/contrib \
+ r6rs/contrib.sls \
+ r6rs/contrib/helper1.sls \
+ r6rs/control.sls \
+ r6rs/enums.sls \
+ r6rs/eval.sls \
+ r6rs/exceptions.sls \
+ r6rs/hashtables.sls \
+ r6rs/io \
+ r6rs/io/ports.sls \
+ r6rs/io/simple.sls \
+ r6rs/lists.sls \
+ r6rs/mutable-pairs.sls \
+ r6rs/mutable-strings.sls \
+ r6rs/programs.sls \
+ r6rs/r5rs.sls \
+ r6rs/reader.sls \
+ r6rs/records \
+ r6rs/records/procedural.sls \
+ r6rs/records/syntactic.sls \
+ r6rs/run \
+ r6rs/run-via-eval.sps \
+ r6rs/run.sps \
+ r6rs/run/arithmetic \
+ r6rs/run/arithmetic/bitwise.sps \
+ r6rs/run/arithmetic/fixnums.sps \
+ r6rs/run/arithmetic/flonums.sps \
+ r6rs/run/base.sps \
+ r6rs/run/bytevectors.sps \
+ r6rs/run/conditions.sps \
+ r6rs/run/contrib.sps \
+ r6rs/run/control.sps \
+ r6rs/run/enums.sps \
+ r6rs/run/eval.sps \
+ r6rs/run/exceptions.sps \
+ r6rs/run/hashtables.sps \
+ r6rs/run/io \
+ r6rs/run/io/ports.sps \
+ r6rs/run/io/simple.sps \
+ r6rs/run/lists.sps \
+ r6rs/run/mutable-pairs.sps \
+ r6rs/run/mutable-strings.sps \
+ r6rs/run/programs.sps \
+ r6rs/run/r5rs.sps \
+ r6rs/run/reader.sps \
+ r6rs/run/records \
+ r6rs/run/records/procedural.sps \
+ r6rs/run/records/syntactic.sps \
+ r6rs/run/sorting.sps \
+ r6rs/run/syntax-case.sps \
+ r6rs/run/unicode.sps \
+ r6rs/sorting.sls \
+ r6rs/syntax-case.sls \
+ r6rs/test.sls \
+ r6rs/unicode.sls \
+ test-equal-hash.sps \
+ test-fxreverse-bit-field.sps \
+ test-getpid.sps \
+ test-issue-10.sps \
+ test-issue-12.sps \
+ test-issue-7.sps \
+ test-issue-8.sps \
+ test-issue-9.sps \
+ test-log.sps
### end of file
@@ -17,10 +17,10 @@
#!r6rs
-(library (tests r6rs arithmetic bitwise)
+(library (r6rs arithmetic bitwise)
(export run-arithmetic-bitwise-tests)
(import (rnrs)
- (tests r6rs test))
+ (r6rs test))
;; Helpers originally from Ikarus test suite:
(define (ref ei)
@@ -17,10 +17,10 @@
#!r6rs
-(library (tests r6rs arithmetic fixnums)
+(library (r6rs arithmetic fixnums)
(export run-arithmetic-fixnums-tests)
(import (rnrs)
- (tests r6rs test))
+ (r6rs test))
;; Originally from Ikarus test suite:
(define (fx*/carry-reference fx1 fx2 fx3)
@@ -17,10 +17,10 @@
#!r6rs
-(library (tests r6rs arithmetic flonums)
+(library (r6rs arithmetic flonums)
(export run-arithmetic-flonums-tests)
(import (rnrs)
- (tests r6rs test))
+ (r6rs test))
(define (try-flonums proc)
(proc 0.0)
View
@@ -17,10 +17,10 @@
#!r6rs
-(library (tests r6rs base)
+(library (r6rs base)
(export run-base-tests)
(import (rnrs)
- (tests r6rs test))
+ (r6rs test))
(define (try-reals f but-not)
(if (not (member 0 but-not))
@@ -17,10 +17,10 @@
#!r6rs
-(library (tests r6rs bytevectors)
+(library (r6rs bytevectors)
(export run-bytevectors-tests)
(import (rnrs)
- (tests r6rs test))
+ (r6rs test))
(define (run-bytevectors-tests)
Oops, something went wrong.

0 comments on commit 1fcfa65

Please sign in to comment.