diff --git a/Jenkinsfile b/Jenkinsfile index bf44592..eacea3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { environment { R6RS_SCHEMES='capyscheme chezscheme guile ikarus ironscheme loko mosh racket sagittarius ypsilon' R7RS_SCHEMES='capyscheme chibi chicken cyclone foment gauche gambit kawa loko meevax mosh racket sagittarius skint stklos tr7 ypsilon' - LIBRARIES='tap ctrf mouth string url-encoding leb128 hardware-info' + LIBRARIES='tap junit ctrf mouth string url-encoding leb128 hardware-info' } stages { diff --git a/Makefile b/Makefile index 0766aee..b05ee0c 100644 --- a/Makefile +++ b/Makefile @@ -14,9 +14,13 @@ VERSION != cat retropikzel/${LIBRARY}/VERSION DESCRIPTION != head -n1 retropikzel/${LIBRARY}/README.md README=retropikzel/${LIBRARY}/README.html +SNOW_PACKAGES="" +AKKU_PACKAGES="" SFX=scm ifeq "${RNRS}" "r6rs" SFX=sps +SNOW_PACKAGES= +AKKU_PACKAGES="akku-r7rs" endif ifeq "${SCHEME}" "capyscheme" @@ -63,9 +67,9 @@ test: testfiles cd ${tmpdir} && ./test-program test-docker: testfiles - SNOW_PACKAGES="srfi.64 srfi.180 ${PKG}" \ + SNOW_PACKAGES="${SNOW_PACKAGES} ${PKG}" \ APT_PACKAGES="libcurl4-openssl-dev" \ - AKKU_PACKAGES="akku-r7rs" \ + AKKU_PACKAGES="${AKKU_PACKAGES}" \ DOCKER_TAG=${DOCKER_TAG} \ COMPILE_R7RS=${SCHEME} \ CSC_OPIONS="-L -lcurl" \ diff --git a/retropikzel/junit.scm b/retropikzel/junit.scm new file mode 100644 index 0000000..1908e23 --- /dev/null +++ b/retropikzel/junit.scm @@ -0,0 +1,202 @@ + +(define-syntax junit-runner + (syntax-rules () + ((_) + (letrec* ((hostname (if (file-exists? "/etc/hostname") + (with-input-from-file "/etc/hostname" + (lambda () (read-line))) + "localhost")) + (any->string + (lambda (any) + (let ((port (open-output-string))) + (display any port) + (get-output-string port)))) + (indentation '()) + (increase-indentation + (lambda () + (set! indentation (append indentation '(#\space #\space))))) + (decrease-indentation + (lambda () + (when (not (null? indentation)) + (set! indentation (list-tail indentation 2))))) + (print + (lambda args + (map display (append indentation args)))) + (println + (lambda args + (map display (append indentation args)) (newline))) + (string-replace + (lambda (str replace with) + (list->string + (map (lambda (c) + (if (char=? c replace) + with + c)) + (string->list str))))) + (runner (test-runner-null)) + (group-tests '()) + (started? #f) + (current-group-name #f) + (current-group-start-time #f) + (current-group-start-date #f) + (current-test-start-time #f) + (current-test-groups (vector)) + (current-test-group-count 0) + (current-suite-name #f) + (total-pass 0) + (total-xpass 0) + (total-fail 0) + (total-xfail 0) + (total-skipped 0)) + + (test-runner-on-group-begin! + runner + (lambda (runner suite-name count) + (set! current-group-name suite-name) + (set! current-group-start-time (current-time time-utc)) + (set! current-group-start-date (current-date)) + (set! current-test-group-count 0) + (set! current-suite-name suite-name) + (set! current-test-groups + (vector-append current-test-groups (vector suite-name))) + (set! group-tests '()))) + + (test-runner-on-group-end! + runner + (lambda (runner) + (let* ((group-time + (time-second (time-difference (current-time time-utc) + current-group-start-time))) + (pass (- (test-runner-pass-count runner) total-pass)) + (xpass (- (test-runner-xpass-count runner) total-xpass)) + (fail (- (test-runner-fail-count runner) total-fail)) + (xfail (- (test-runner-xfail-count runner) total-xfail)) + (skipped (- (test-runner-skip-count runner) total-skipped)) + (total-tests (+ pass xpass fail xfail skipped)) + (timestamp + (date->string current-group-start-date "~1-T~3+0000")) + (testsuite-name-raw + (apply string-append + (map + (lambda (item) + (string-append item ".")) + (test-runner-group-path runner)))) + (testsuite-name + (string-replace + (string-copy testsuite-name-raw + 0 + (- (string-length testsuite-name-raw) 1)) + #\space + #\-))) + + (when (> total-tests 0) + (println "") + (increase-indentation) + (for-each + (lambda (test) + (println "string (cdr (assoc 'count test)))) + "\"" + " name=\"" + (if (string=? (cdr (assoc 'name test)) "") + (cdr (assoc 'count test)) + (cdr (assoc 'name test))) + "\"" + " time=\"" (cdr (assoc 'duration test)) "\"" + ">") + (when (string=? (cdr (assoc 'status test)) "failed") + (increase-indentation) + (println "") + (println "") + (decrease-indentation)) + (println "")) + (reverse group-tests)) + (decrease-indentation) + (println "") + (set! current-test-groups + (list->vector + (reverse + (list-tail + (reverse (vector->list current-test-groups)) + 1)))) + (set! total-pass (test-runner-pass-count runner)) + (set! total-xpass (test-runner-xpass-count runner)) + (set! total-fail (test-runner-fail-count runner)) + (set! total-xfail (test-runner-xfail-count runner)) + (set! total-skipped (test-runner-skip-count runner)))))) + + (test-runner-on-test-begin! + runner + (lambda (runner) + (when (not started?) + (println "") + (println "") + (increase-indentation) + (set! started? #t)) + (set! current-test-group-count (+ current-test-group-count 1)) + (set! current-test-start-time (current-time time-utc)))) + + (test-runner-on-test-end! + runner + (lambda (runner) + (let* ((end-time (current-time time-utc)) + (duration + (time-second + (time-difference end-time current-test-start-time))) + (name (test-runner-test-name runner)) + (result (test-result-kind runner)) + (status (cond ((equal? result 'pass) "passed") + ((equal? result 'xpass) "passed") + ((equal? result 'fail) "failed") + ((equal? result 'xfail) "failed") + ((equal? result 'skipped) "skipped") + (else "other"))) + (result-ref + (lambda (runner key) + (let ((value (test-result-ref runner key))) + (if value (any->string value) ""))))) + (let* ((suite (car (reverse (vector->list current-test-groups)))) + (test `((name . ,name) + (status . ,status) + (duration . ,duration) + (suite . ,suite) + (source-file . ,(result-ref runner 'source-file)) + (source-line . ,(result-ref runner 'source-line)) + (source-form . ,(result-ref runner 'source-form)) + (count . ,current-test-group-count) + (expected-value . ,(result-ref runner 'expected-value)) + (actual-value . ,(result-ref runner 'actual-value)) + (expected-error . ,(result-ref runner 'expected-error)) + (actual-error . ,(result-ref runner 'actual-error))))) + (set! group-tests (cons test group-tests)))))) + + (test-runner-on-final! + runner + (lambda (runner) + (decrease-indentation) + (println ""))) + + runner)))) diff --git a/retropikzel/junit.sld b/retropikzel/junit.sld new file mode 100644 index 0000000..2e9251a --- /dev/null +++ b/retropikzel/junit.sld @@ -0,0 +1,9 @@ +(define-library + (retropikzel junit) + (import (scheme base) + (scheme write) + (scheme file) + (srfi 19) + (srfi 64)) + (export junit-runner) + (include "junit.scm")) diff --git a/retropikzel/junit/LICENSE b/retropikzel/junit/LICENSE new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/retropikzel/junit/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/retropikzel/junit/README.md b/retropikzel/junit/README.md new file mode 100644 index 0000000..c5161ca --- /dev/null +++ b/retropikzel/junit/README.md @@ -0,0 +1,12 @@ +JUnit, output for SRFI-64 + +[JUnit](https://junit.org/) + +Usage: + + + (import (scheme base) + (srfi 64) + (retropikzel junit)) + + (test-runner-current (junit-runner)) diff --git a/retropikzel/junit/VERSION b/retropikzel/junit/VERSION new file mode 100644 index 0000000..0ea3a94 --- /dev/null +++ b/retropikzel/junit/VERSION @@ -0,0 +1 @@ +0.2.0 diff --git a/retropikzel/junit/test.scm b/retropikzel/junit/test.scm new file mode 100644 index 0000000..1c2f8bd --- /dev/null +++ b/retropikzel/junit/test.scm @@ -0,0 +1,19 @@ + +(test-runner-current (junit-runner)) + +(test-begin "junit") + +(test-begin "junit 1") +(test-assert #t) +(test-assert #t) +(test-assert #f) +(test-equal '(1 2 3) '(4 5 6)) +(test-end "junit 1") + +(test-begin "junit 2") +(test-equal '(1 2 3) '(1 2 3)) +(test-assert #t) +(test-assert "I have a name" #t) +(test-end "junit 2") + +(test-end "junit") diff --git a/retropikzel/tap/README.md b/retropikzel/tap/README.md index 2bbadf0..8806465 100644 --- a/retropikzel/tap/README.md +++ b/retropikzel/tap/README.md @@ -1,4 +1,4 @@ -TAP, the Test Anything Protocol, is a simple text-based interface between testing modules in a test harness. +TAP, the Test Anything Protocol, output for SRFI-64 [Test Anything Protocol](https://testanything.org/)