diff options
| author |  Arvydas Silanskas
| 2021-11-11 22:54:04 +0200 |
|---|---|---|
| committer | Arvydas Silanskas
| 2021-11-11 22:54:04 +0200 |
| commit | 0fe8588181a9e3d45c644460676f72c38f309092 (patch) | |
| tree | 2736a3c5db90f61fdbd110e20511fcdfe1e959b9 | |
| parent | fix mapping implementations for dict-alter (diff) | |
fix kawa docker test
Diffstat (limited to '')
| -rw-r--r-- | docker-compose.yml | 12 | ||||
| -rw-r--r-- | docker-kawa.sh | 7 | ||||
| -rw-r--r-- | makefile | 3 | ||||
| -rw-r--r-- | srfi-225-test.scm | 21 | ||||
| -rw-r--r-- | srfi/225.sld | 4 |
5 files changed, 30 insertions, 17 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 3aa9e00..8ea257e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,18 @@ services: source: . target: /test/srfi-225 command: "sh /test/srfi-225/docker-chibi.sh" + kawa: + image: "schemers/kawa" + depends_on: + - srfi_225_test + volumes: + - dependencies-volume:/dependencies + - target:/target + - type: bind + source: . + target: /test/srfi-225 + command: "sh /test/srfi-225/docker-kawa.sh" volumes: dependencies-volume: + target: diff --git a/docker-kawa.sh b/docker-kawa.sh index 64de401..bf3ad2e 100644 --- a/docker-kawa.sh +++ b/docker-kawa.sh @@ -1,4 +1,4 @@ -mkdir /target +rm -r /target/* for i in\ "srfi-27/srfi/27"\ @@ -18,6 +18,7 @@ for i in\ do CLASSPATH=target kawa -d target -C "dependencies/$i.sld" done - CLASSPATH=target kawa --r7rs -d target -C "test/srfi-225/srfi/225.sld" -CLASSPATH=target kawa --r7rs "test/srfi-225/srfi-225-test.scm" + +cd "/test/srfi-225" +CLASSPATH=/target kawa --r7rs "srfi-225-test.scm" @@ -9,6 +9,9 @@ test-chibi-docker: test-gauche-docker: docker-compose run --rm gauche +test-kawa-docker: + docker-compose run --rm kawa + test-chibi: chibi-scheme -I . srfi-225-test.scm diff --git a/srfi-225-test.scm b/srfi-225-test.scm index 31f862d..68402bc 100644 --- a/srfi-225-test.scm +++ b/srfi-225-test.scm @@ -688,7 +688,7 @@ (test-group "dict-for-each<" (test-for-each (let* ((cmp (dict-comparator dtd (alist->dict '()))) - (ordering (and cmp (comparator-ordering-predicate cmp)))) + (ordering (and cmp (comparator-ordered? cmp)))) ordering) (lambda (proc) (dict-for-each< dtd @@ -703,7 +703,7 @@ (test-group "dict-for-each<=" (test-for-each (let* ((cmp (dict-comparator dtd (alist->dict '()))) - (ordering (and cmp (comparator-ordering-predicate cmp)))) + (ordering (and cmp (comparator-ordered? cmp)))) ordering) (lambda (proc) (dict-for-each<= dtd @@ -718,7 +718,7 @@ (test-group "dict-for-each>" (test-for-each (let* ((cmp (dict-comparator dtd (alist->dict '()))) - (ordering (and cmp (comparator-ordering-predicate cmp)))) + (ordering (and cmp (comparator-ordered? cmp)))) ordering) (lambda (proc) (dict-for-each> dtd @@ -733,7 +733,7 @@ (test-group "dict-for-each>=" (test-for-each (let* ((cmp (dict-comparator dtd (alist->dict '()))) - (ordering (and cmp (comparator-ordering-predicate cmp)))) + (ordering (and cmp (comparator-ordered? cmp)))) ordering) (lambda (proc) (dict-for-each>= dtd @@ -748,7 +748,7 @@ (test-group "dict-for-each-in-open-interval" (test-for-each (let* ((cmp (dict-comparator dtd (alist->dict '()))) - (ordering (and cmp (comparator-ordering-predicate cmp)))) + (ordering (and cmp (comparator-ordered? cmp)))) ordering) (lambda (proc) (dict-for-each-in-open-interval dtd @@ -763,7 +763,7 @@ (test-group "dict-for-each-in-closed-interval" (test-for-each (let* ((cmp (dict-comparator dtd (alist->dict '()))) - (ordering (and cmp (comparator-ordering-predicate cmp)))) + (ordering (and cmp (comparator-ordered? cmp)))) ordering) (lambda (proc) (dict-for-each-in-closed-interval dtd @@ -778,7 +778,7 @@ (test-group "dict-for-each-in-open-closed-interval" (test-for-each (let* ((cmp (dict-comparator dtd (alist->dict '()))) - (ordering (and cmp (comparator-ordering-predicate cmp)))) + (ordering (and cmp (comparator-ordered? cmp)))) ordering) (lambda (proc) (dict-for-each-in-open-closed-interval dtd @@ -793,7 +793,7 @@ (test-group "dict-for-each-in-closed-open-interval" (test-for-each (let* ((cmp (dict-comparator dtd (alist->dict '()))) - (ordering (and cmp (comparator-ordering-predicate cmp)))) + (ordering (and cmp (comparator-ordered? cmp)))) ordering) (lambda (proc) (dict-for-each-in-closed-open-interval dtd @@ -836,7 +836,7 @@ ;; check all procs were called (for-each (lambda (index) - (when (= 0 (vector-ref counter index)) + (when (> 0 (vector-ref counter index)) (error "Untested procedure" index))) (iota (vector-length counter)))) @@ -876,7 +876,8 @@ (cond-expand ((and (library (srfi 69)) - (not gauche)) ;; gauche has bug with comparator retrieval from srfi 69 table + (not gauche) ;; gauche has bug with comparator retrieval from srfi 69 table + ) (test-group "srfi-69" (do-test diff --git a/srfi/225.sld b/srfi/225.sld index aee7c59..a410b62 100644 --- a/srfi/225.sld +++ b/srfi/225.sld @@ -23,8 +23,6 @@ ;; lookup dict-ref dict-ref/default - dict-min-key - dict-max-key ;; mutation dict-set @@ -104,8 +102,6 @@ dict-mutable?-id dict-ref-id dict-ref/default-id - dict-min-key-id - dict-max-key-id dict-set-id dict-adjoin-id dict-delete-id |