From f58ad91b1139572730f3ef9b2511e2575b1c0223 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 5 Oct 2024 12:34:48 +0300 Subject: [PATCH] Making the jenkins build work --- Jenkinsfile | 26 ++++++++++++++++++++++++++ Makefile | 8 ++++---- build.scm | 7 +++++-- tests.scm | 3 +-- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cb0b9e7..d8bf9a9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -71,6 +71,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + + sh 'chibi-scheme -I ./snow r7rs-tests.scm' sh 'for f in *.log; do cp -- "$f" "reports/chibi-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -102,6 +104,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + sh ' ls && cp snow/chibi/term/ansi.sld snow.chibi.term.ansi.sld && csc -include-path ./snow/chibi -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 -X r7rs -R r7rs -s -J snow.chibi.optional.sld && cp snow/chibi/diff.sld snow.chibi.diff.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.diff.sld && cp snow/chibi/test.sld snow.chibi.test.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.test.sld' + sh 'csc -include-path ./snow/chibi -X r7rs -R r7rs r7rs-tests.scm && ./r7rs-test && rm r7rs-test' sh 'for f in *.log; do cp -- "$f" "reports/chicken-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -133,6 +137,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + 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-test && rm r7rs-test' sh 'for f in *.log; do cp -- "$f" "reports/cyclone-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -164,6 +170,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + 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-test && rm r7rs-test' sh 'for f in *.log; do cp -- "$f" "reports/gambit-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -195,6 +203,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + + sh 'gosh -r7 -A ./snow r7rs-tests.scm' sh 'for f in *.log; do cp -- "$f" "reports/gauche-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -226,6 +236,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + + sh 'guile --fresh-auto-compile --r7rs -L . -L ./snow r7rs-tests.scm' sh 'for f in *.log; do cp -- "$f" "reports/guile-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -257,6 +269,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + + sh 'kawa --r7rs -Dkawa.import.path=..:../snow:*.sld:./snow/chibi/*.sld:./snow/chibi/term/*.sld r7rs-tests.scm' sh 'for f in *.log; do cp -- "$f" "reports/kawa-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -288,6 +302,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + 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-test && rm r7rs-test' sh 'for f in *.log; do cp -- "$f" "reports/loko-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -319,6 +335,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + + sh 'mit-scheme --load r7rs-tests.scm' sh 'for f in *.log; do cp -- "$f" "reports/mit-scheme-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -350,6 +368,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + + sh 'sash -r7 -L ./snow r7rs-tests.scm > r7rs-test.log && cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/sagittarius-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -381,6 +401,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + + sh 'stklos -I . r7rs-tests.scm' sh 'for f in *.log; do cp -- "$f" "reports/stklos-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -412,6 +434,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + + sh 'skint --program r7rs-tests.scm' sh 'for f in *.log; do cp -- "$f" "reports/skint-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -443,6 +467,8 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' unstash 'tests' + + sh 'tr7i r7rs-tests.scm' 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 6e07009..d989973 100644 --- a/Makefile +++ b/Makefile @@ -4,17 +4,17 @@ test-chibi-r7rs-test: test-chicken-r7rs-test: - docker run -it -v ${PWD}:/workdir:z schemers/chicken bash -c "cd workdir && ls && cp snow/chibi/optional.sld snow.chibi.optional.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.optional.sld && cp snow/chibi/diff.sld snow.chibi.diff.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.diff.sld && cp snow/chibi/test.sld snow.chibi.test.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.test.sld" + 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 -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 -X r7rs -R r7rs -s -J snow.chibi.optional.sld && cp snow/chibi/diff.sld snow.chibi.diff.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.diff.sld && cp snow/chibi/test.sld snow.chibi.test.sld && csc -include-path ./snow/chibi -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-test && rm r7rs-test" test-cyclone-r7rs-test: - docker run -it -v ${PWD}:/workdir:z schemers/cyclone bash -c "cd workdir && ls && 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 && 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-test && rm r7rs-test" test-gambit-r7rs-test: - docker run -it -v ${PWD}:/workdir:z schemers/gambit bash -c "cd workdir && ls && 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 && 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-test && rm r7rs-test" @@ -34,7 +34,7 @@ test-kawa-r7rs-test: test-loko-r7rs-test: - docker run -it -v ${PWD}:/workdir:z schemers/loko bash -c "cd workdir && ls && 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 && 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-test && rm r7rs-test" diff --git a/build.scm b/build.scm index b46c88c..e9c5538 100644 --- a/build.scm +++ b/build.scm @@ -18,6 +18,8 @@ ((string=? name "chicken") (string-append " ls " + " && cp snow/chibi/term/ansi.sld snow.chibi.term.ansi.sld" + " && " (cdr library-command) " snow.chibi.term.ansi.sld" " && cp snow/chibi/optional.sld snow.chibi.optional.sld" " && " (cdr library-command) " snow.chibi.optional.sld" " && cp snow/chibi/diff.sld snow.chibi.diff.sld" @@ -27,6 +29,7 @@ )) (else (string-append " ls " + " && " (cdr library-command) " snow/chibi/term/ansi" (if (string=? name "gambit") "" ".sld") " && " (cdr library-command) " snow/chibi/optional" (if (string=? name "gambit") "" ".sld") " && " (cdr library-command) " snow/chibi/diff" (if (string=? name "gambit") "" ".sld") " && " (cdr library-command) " snow/chibi/test" (if (string=? name "gambit") "" ".sld") @@ -76,8 +79,8 @@ (lambda (test) (execute jenkinsfile-job `((command . ,(full-command implementation test)) - (library-command . ,(full-library-command implementation test)) - out))) + (library-command . ,(full-library-command implementation test))) + out)) tests) (execute jenkinsfile-job-bottom `((name . ,(cdr (assoc 'name implementation)))) out) (newline out))) diff --git a/tests.scm b/tests.scm index 7d4c369..c7ccb8a 100644 --- a/tests.scm +++ b/tests.scm @@ -1,3 +1,2 @@ (define tests - '(((name . "r7rs-test") - (file . "r7rs-tests.scm")))) + '(((name . "r7rs-test") (file . "r7rs-tests.scm"))))