diff --git a/Jenkinsfile b/Jenkinsfile index 333b5e3..696b834 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'chibi-scheme -I ./snow/chibi r7rs-tests.scm> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/chibi-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -101,7 +101,7 @@ pipeline { 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-test && rm r7rs-test> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/chicken-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -134,7 +134,7 @@ pipeline { 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-test && rm r7rs-test> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/cyclone-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -167,7 +167,7 @@ pipeline { 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-test && rm r7rs-test> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/gambit-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -200,7 +200,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'gosh -r7 -A ./snow r7rs-tests.scm> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/gauche-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -233,7 +233,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'guile --fresh-auto-compile --r7rs -L . -L ./snow r7rs-tests.scm> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/guile-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -266,7 +266,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'kawa --r7rs -Dkawa.import.path=./snow/chibi/*.sld:./snow/srfi/*.sld r7rs-tests.scm> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/kawa-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -299,7 +299,7 @@ pipeline { 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-test && rm r7rs-test> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/loko-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -332,7 +332,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'mit-scheme --load r7rs-tests.scm> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/mit-scheme-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -365,7 +365,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'sash -r7 -L ./snow r7rs-tests.scm > r7rs-test.log && cat r7rs-test.log> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/sagittarius-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -398,7 +398,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'stklos -I ./snow r7rs-tests.scm> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/stklos-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -431,7 +431,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'skint --program r7rs-tests.scm> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/skint-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -464,7 +464,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'tr7i r7rs-tests.scm> r7rs-test.log' - sh 'cat *.log' + sh 'cat r7rs-test.log' sh 'for f in *.log; do cp -- "$f" "reports/tr7-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' diff --git a/build.scm b/build.scm index 6710639..2ca1831 100644 --- a/build.scm +++ b/build.scm @@ -77,11 +77,13 @@ (string-append "schemers/" name)))) out) (for-each (lambda (test) - (execute jenkinsfile-job - `((command . ,(string-append (full-command implementation test) - "> " (cdr (assoc 'name test)) ".log")) - (library-command . ,(full-library-command implementation test))) - out)) + (let ((test-name (cdr (assoc 'name test)))) + (execute jenkinsfile-job + `((command . ,(string-append (full-command implementation test) + "> " test-name ".log")) + (log-command . ,(string-append "cat " test-name ".log")) + (library-command . ,(full-library-command implementation test))) + out))) tests) (execute jenkinsfile-job-bottom `((name . ,(cdr (assoc 'name implementation)))) out) (newline out))) diff --git a/templates/Jenkinsfile-job b/templates/Jenkinsfile-job index cd14f05..dce7f1d 100644 --- a/templates/Jenkinsfile-job +++ b/templates/Jenkinsfile-job @@ -1,2 +1,3 @@ {{#library-command}}sh '{{{library-command}}}'{{/library-command}} sh '{{{command}}}' + sh '{{{log-command}}}' diff --git a/templates/Jenkinsfile-job-bottom b/templates/Jenkinsfile-job-bottom index 1bc25e0..df07bcc 100644 --- a/templates/Jenkinsfile-job-bottom +++ b/templates/Jenkinsfile-job-bottom @@ -1,4 +1,3 @@ - sh 'cat *.log' sh 'for f in *.log; do cp -- "$f" "reports/{{name}}-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*'