# HG changeset patch # User Steve Losh # Date 1550950457 18000 # Node ID db7fd8486570212572c4f0ca0c9e4114873aeca0 # Parent 3f64e658c74cd5d3fda5d4750d8d443594360310 Fix the tests in ABCL diff -r 3f64e658c74c -r db7fd8486570 .ffignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.ffignore Sat Feb 23 14:34:17 2019 -0500 @@ -0,0 +1,1 @@ +docs/build diff -r 3f64e658c74c -r db7fd8486570 Makefile --- a/Makefile Sat Feb 23 14:24:48 2019 -0500 +++ b/Makefile Sat Feb 23 14:34:17 2019 -0500 @@ -24,7 +24,7 @@ test-ecl: vendor $(heading_printer) roman 'ECL' - ecl --load test/run.lisp + ecl -load test/run.lisp test-abcl: vendor $(heading_printer) broadway 'ABCL' diff -r 3f64e658c74c -r db7fd8486570 cl-netpbm.asd --- a/cl-netpbm.asd Sat Feb 23 14:24:48 2019 -0500 +++ b/cl-netpbm.asd Sat Feb 23 14:34:17 2019 -0500 @@ -25,7 +25,7 @@ :author "Steve Losh " :license "MIT/X11" - :depends-on (:cl-netpbm :1am) + :depends-on (:cl-netpbm :1am :external-program) :serial t :components ((:file "package.test") diff -r 3f64e658c74c -r db7fd8486570 docs/01-installation.markdown --- a/docs/01-installation.markdown Sat Feb 23 14:24:48 2019 -0500 +++ b/docs/01-installation.markdown Sat Feb 23 14:34:17 2019 -0500 @@ -9,7 +9,7 @@ dependencies. The `cl-netpbm/test` system provides the unit tests. It depends on `1am` and -`uiop`, and also requires [ImageMagick][im] for its fuzz testing. +`external-program`, and also requires [ImageMagick][im] for its fuzz testing. [local]: https://www.quicklisp.org/beta/faq.html#local-project [im]: https://www.imagemagick.org/ diff -r 3f64e658c74c -r db7fd8486570 test/tests.lisp --- a/test/tests.lisp Sat Feb 23 14:24:48 2019 -0500 +++ b/test/tests.lisp Sat Feb 23 14:34:17 2019 -0500 @@ -151,12 +151,13 @@ :if-exists :supersede :format original-format :encoding :ascii) - (uiop:run-program (list "convert" "-format" (ecase original-format - (:ppm "ppm") - (:pgm "pgm") - (:pbm "pbm")) - "test/data/fuzz.convert.in" - "test/data/fuzz.convert.out")) + (external-program:run "convert" + (list "-format" (ecase original-format + (:ppm "ppm") + (:pgm "pgm") + (:pbm "pbm")) + "test/data/fuzz.convert.in" + "test/data/fuzz.convert.out")) (multiple-value-bind (new new-format) (read-from-file "test/data/fuzz.convert.out") (is (eql original-format new-format))