From c72adce0bb6fed674d191683391201564523e63f Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 5 Oct 2024 15:06:19 +0300 Subject: [PATCH] Making the reports work --- Jenkinsfile | 52 ++++++++++++++++++++++++++-------------------------- Makefile | 52 ++++++++++++++++++++++++++-------------------------- README.md | 7 +++++++ tests.scm | 2 +- update-tests | 3 ++- 5 files changed, 62 insertions(+), 54 deletions(-) create mode 100644 README.md diff --git a/Jenkinsfile b/Jenkinsfile index 47099d3..b1c4a41 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,8 +67,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'chibi-scheme -I ./snow/chibi r7rs-tests.scm> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'chibi-scheme -I ./snow/chibi r7rs-tests-1.scm> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/chibi-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -100,8 +100,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' sh ' ls && cp snow/chibi/term/ansi.sld snow.chibi.term.ansi.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.term.ansi.sld && cp snow/chibi/optional.sld snow.chibi.optional.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.optional.sld && cp snow/chibi/diff.sld snow.chibi.diff.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.diff.sld && cp snow/chibi/test.sld snow.chibi.test.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.test.sld' - sh 'csc -include-path ./snow/chibi -X r7rs -R r7rs r7rs-tests.scm && ./r7rs-tests && rm r7rs-tests> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'csc -include-path ./snow/chibi -X r7rs -R r7rs r7rs-tests-1.scm && ./r7rs-tests-1 && rm r7rs-tests-1> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/chicken-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -133,8 +133,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' sh ' ls && cyclone -A . snow/chibi/term/ansi.sld && cyclone -A . snow/chibi/optional.sld && cyclone -A . snow/chibi/diff.sld && cyclone -A . snow/chibi/test.sld' - sh 'cyclone -A . r7rs-tests.scm && ./r7rs-tests && rm r7rs-tests> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'cyclone -A . r7rs-tests-1.scm && ./r7rs-tests-1 && rm r7rs-tests-1> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/cyclone-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -166,8 +166,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' sh ' ls && gsc . snow/chibi/term/ansi && gsc . snow/chibi/optional && gsc . snow/chibi/diff && gsc . snow/chibi/test' - sh 'gsc -exe . -nopreload r7rs-tests.scm && ./r7rs-tests && rm r7rs-tests> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'gsc -exe . -nopreload r7rs-tests-1.scm && ./r7rs-tests-1 && rm r7rs-tests-1> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/gambit-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -199,8 +199,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'gosh -r7 -A ./snow r7rs-tests.scm> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'gosh -r7 -A ./snow r7rs-tests-1.scm> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/gauche-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -232,8 +232,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'guile --fresh-auto-compile --r7rs -L . -L ./snow r7rs-tests.scm> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'guile --fresh-auto-compile --r7rs -L . -L ./snow r7rs-tests-1.scm> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/guile-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -265,8 +265,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'kawa --r7rs -Dkawa.import.path=./snow/chibi/*.sld:./snow/srfi/*.sld r7rs-tests.scm> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'kawa --r7rs -Dkawa.import.path=./snow/chibi/*.sld:./snow/srfi/*.sld r7rs-tests-1.scm> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/kawa-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -298,8 +298,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' sh ' ls && ls snow/chibi/term/ansi.sld && ls snow/chibi/optional.sld && ls snow/chibi/diff.sld && ls snow/chibi/test.sld' - sh 'LOKO_LIBRARY_PATH=./snow loko -std=r7rs --compile r7rs-tests.scm && ./r7rs-tests && rm r7rs-tests> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'LOKO_LIBRARY_PATH=./snow loko -std=r7rs --compile r7rs-tests-1.scm && ./r7rs-tests-1 && rm r7rs-tests-1> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/loko-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -331,8 +331,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'mit-scheme --load r7rs-tests.scm> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'mit-scheme --load r7rs-tests-1.scm> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/mit-scheme-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -364,8 +364,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'sash -r7 -L ./snow r7rs-tests.scm > r7rs-tests.log && cat r7rs-tests.log> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'sash -r7 -L ./snow r7rs-tests-1.scm > r7rs-tests-1.log && cat r7rs-tests-1.log> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/sagittarius-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -397,8 +397,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'stklos -I ./snow r7rs-tests.scm> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'stklos -I ./snow r7rs-tests-1.scm> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/stklos-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -430,8 +430,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'skint --program r7rs-tests.scm> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'skint --program r7rs-tests-1.scm> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/skint-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -463,8 +463,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'tr7i r7rs-tests.scm> r7rs-tests.log' - sh 'cat r7rs-tests.log' + sh 'tr7i r7rs-tests-1.scm> r7rs-tests-1.log' + sh 'cat r7rs-tests-1.log' sh 'for f in *.log; do cp -- "$f" "reports/tr7-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' diff --git a/Makefile b/Makefile index 983c0d4..b74b4ca 100644 --- a/Makefile +++ b/Makefile @@ -1,66 +1,66 @@ -test-chibi-r7rs-tests: +test-chibi-r7rs-tests-1: - docker run -it -v ${PWD}:/workdir:z schemers/chibi bash -c "cd workdir && chibi-scheme -I ./snow/chibi r7rs-tests.scm" + docker run -it -v ${PWD}:/workdir:z schemers/chibi bash -c "cd workdir && chibi-scheme -I ./snow/chibi r7rs-tests-1.scm" -test-chicken-r7rs-tests: +test-chicken-r7rs-tests-1: docker run -it -v ${PWD}:/workdir:z schemers/chicken bash -c "cd workdir && ls && cp snow/chibi/term/ansi.sld snow.chibi.term.ansi.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.term.ansi.sld && cp snow/chibi/optional.sld snow.chibi.optional.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.optional.sld && cp snow/chibi/diff.sld snow.chibi.diff.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.diff.sld && cp snow/chibi/test.sld snow.chibi.test.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.test.sld" - docker run -it -v ${PWD}:/workdir:z schemers/chicken bash -c "cd workdir && csc -include-path ./snow/chibi -X r7rs -R r7rs r7rs-tests.scm && ./r7rs-tests && rm r7rs-tests" + docker run -it -v ${PWD}:/workdir:z schemers/chicken bash -c "cd workdir && csc -include-path ./snow/chibi -X r7rs -R r7rs r7rs-tests-1.scm && ./r7rs-tests-1 && rm r7rs-tests-1" -test-cyclone-r7rs-tests: +test-cyclone-r7rs-tests-1: docker run -it -v ${PWD}:/workdir:z schemers/cyclone bash -c "cd workdir && ls && cyclone -A . snow/chibi/term/ansi.sld && cyclone -A . snow/chibi/optional.sld && cyclone -A . snow/chibi/diff.sld && cyclone -A . snow/chibi/test.sld" - docker run -it -v ${PWD}:/workdir:z schemers/cyclone bash -c "cd workdir && cyclone -A . r7rs-tests.scm && ./r7rs-tests && rm r7rs-tests" + docker run -it -v ${PWD}:/workdir:z schemers/cyclone bash -c "cd workdir && cyclone -A . r7rs-tests-1.scm && ./r7rs-tests-1 && rm r7rs-tests-1" -test-gambit-r7rs-tests: +test-gambit-r7rs-tests-1: docker run -it -v ${PWD}:/workdir:z schemers/gambit bash -c "cd workdir && ls && gsc . snow/chibi/term/ansi && gsc . snow/chibi/optional && gsc . snow/chibi/diff && gsc . snow/chibi/test" - docker run -it -v ${PWD}:/workdir:z schemers/gambit bash -c "cd workdir && gsc -exe . -nopreload r7rs-tests.scm && ./r7rs-tests && rm r7rs-tests" + docker run -it -v ${PWD}:/workdir:z schemers/gambit bash -c "cd workdir && gsc -exe . -nopreload r7rs-tests-1.scm && ./r7rs-tests-1 && rm r7rs-tests-1" -test-gauche-r7rs-tests: +test-gauche-r7rs-tests-1: - docker run -it -v ${PWD}:/workdir:z schemers/gauche bash -c "cd workdir && gosh -r7 -A ./snow r7rs-tests.scm" + docker run -it -v ${PWD}:/workdir:z schemers/gauche bash -c "cd workdir && gosh -r7 -A ./snow r7rs-tests-1.scm" -test-guile-r7rs-tests: +test-guile-r7rs-tests-1: - docker run -it -v ${PWD}:/workdir:z schemers/guile bash -c "cd workdir && guile --fresh-auto-compile --r7rs -L . -L ./snow r7rs-tests.scm" + docker run -it -v ${PWD}:/workdir:z schemers/guile bash -c "cd workdir && guile --fresh-auto-compile --r7rs -L . -L ./snow r7rs-tests-1.scm" -test-kawa-r7rs-tests: +test-kawa-r7rs-tests-1: - docker run -it -v ${PWD}:/workdir:z schemers/kawa bash -c "cd workdir && kawa --r7rs -Dkawa.import.path=./snow/chibi/*.sld:./snow/srfi/*.sld r7rs-tests.scm" + docker run -it -v ${PWD}:/workdir:z schemers/kawa bash -c "cd workdir && kawa --r7rs -Dkawa.import.path=./snow/chibi/*.sld:./snow/srfi/*.sld r7rs-tests-1.scm" -test-loko-r7rs-tests: +test-loko-r7rs-tests-1: docker run -it -v ${PWD}:/workdir:z schemers/loko bash -c "cd workdir && ls && ls snow/chibi/term/ansi.sld && ls snow/chibi/optional.sld && ls snow/chibi/diff.sld && ls snow/chibi/test.sld" - docker run -it -v ${PWD}:/workdir:z schemers/loko bash -c "cd workdir && LOKO_LIBRARY_PATH=./snow loko -std=r7rs --compile r7rs-tests.scm && ./r7rs-tests && rm r7rs-tests" + docker run -it -v ${PWD}:/workdir:z schemers/loko bash -c "cd workdir && LOKO_LIBRARY_PATH=./snow loko -std=r7rs --compile r7rs-tests-1.scm && ./r7rs-tests-1 && rm r7rs-tests-1" -test-mit-scheme-r7rs-tests: +test-mit-scheme-r7rs-tests-1: - docker run -it -v ${PWD}:/workdir:z schemers/mit-scheme bash -c "cd workdir && mit-scheme --load r7rs-tests.scm" + docker run -it -v ${PWD}:/workdir:z schemers/mit-scheme bash -c "cd workdir && mit-scheme --load r7rs-tests-1.scm" -test-sagittarius-r7rs-tests: +test-sagittarius-r7rs-tests-1: - docker run -it -v ${PWD}:/workdir:z schemers/sagittarius bash -c "cd workdir && sash -r7 -L ./snow r7rs-tests.scm > r7rs-tests.log && cat r7rs-tests.log" + docker run -it -v ${PWD}:/workdir:z schemers/sagittarius bash -c "cd workdir && sash -r7 -L ./snow r7rs-tests-1.scm > r7rs-tests-1.log && cat r7rs-tests-1.log" -test-stklos-r7rs-tests: +test-stklos-r7rs-tests-1: - docker run -it -v ${PWD}:/workdir:z schemers/stklos bash -c "cd workdir && stklos -I ./snow r7rs-tests.scm" + docker run -it -v ${PWD}:/workdir:z schemers/stklos bash -c "cd workdir && stklos -I ./snow r7rs-tests-1.scm" -test-skint-r7rs-tests: +test-skint-r7rs-tests-1: - docker run -it -v ${PWD}:/workdir:z schemers/skint bash -c "cd workdir && skint --program r7rs-tests.scm" + docker run -it -v ${PWD}:/workdir:z schemers/skint bash -c "cd workdir && skint --program r7rs-tests-1.scm" -test-tr7-r7rs-tests: +test-tr7-r7rs-tests-1: - docker run -it -v ${PWD}:/workdir:z schemers/tr7 bash -c "cd workdir && tr7i r7rs-tests.scm" + docker run -it -v ${PWD}:/workdir:z schemers/tr7 bash -c "cd workdir && tr7i r7rs-tests-1.scm" clean: diff --git a/README.md b/README.md new file mode 100644 index 0000000..b63ff62 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +Running different R7RS tests on different implementations + +- [r7rs-tests-1](https://github.com/ashinn/chibi-scheme/blob/master/tests/r7rs-tests.scm) + - Chibi Schemes r7rs tests +- [r7rs-tests-2](https://github.com/larcenists/larceny/tree/master/test/R7RS) + - Larcenys r7rs tests + diff --git a/tests.scm b/tests.scm index bfd7320..2b32ed5 100644 --- a/tests.scm +++ b/tests.scm @@ -1,2 +1,2 @@ (define tests - '(((name . "r7rs-tests") (file . "r7rs-tests.scm")))) + '(((name . "r7rs-tests-1") (file . "r7rs-tests-1.scm")))) diff --git a/update-tests b/update-tests index 8608228..79fca69 100755 --- a/update-tests +++ b/update-tests @@ -1,4 +1,5 @@ #/bin/sh -rm -rf r7rs-tests.scm +rm -rf r7rs-tests-1.scm wget https://raw.githubusercontent.com/ashinn/chibi-scheme/refs/heads/master/tests/r7rs-tests.scm +mv r7rs-tests.scm r7rs-tests-1.scm