--- a/Makefile Wed Dec 26 21:24:37 2018 -0500
+++ b/Makefile Wed Dec 26 21:37:47 2018 -0500
@@ -8,33 +8,33 @@
# Testing ---------------------------------------------------------------------
test: test-sbcl test-ccl test-ecl test-abcl
-test-sbcl: vendor
+test-sbcl:
$(heading_printer) computer 'SBCL'
sbcl --load test/run.lisp
-test-ccl: vendor
+test-ccl:
$(heading_printer) slant 'CCL'
ccl --load test/run.lisp
-test-ecl: vendor
+test-ecl:
$(heading_printer) roman 'ECL'
ecl --load test/run.lisp
-test-abcl: vendor
+test-abcl:
$(heading_printer) broadway 'ABCL'
abcl --load test/run.lisp
# Documentation ---------------------------------------------------------------
-$(apidocs): $(sourcefiles)
- sbcl --noinform --load docs/api.lisp --eval '(quit)'
+# $(apidocs): $(sourcefiles)
+# sbcl --noinform --load docs/api.lisp --eval '(quit)'
-docs/build/index.html: $(docfiles) $(apidocs) docs/title
- cd docs && ~/.virtualenvs/d/bin/d
+# docs/build/index.html: $(docfiles) $(apidocs) docs/title
+# cd docs && ~/.virtualenvs/d/bin/d
-docs: docs/build/index.html
+# docs: docs/build/index.html
-pubdocs: docs
- hg -R ~/src/sjl.bitbucket.org pull -u
- rsync --delete -a ./docs/build/ ~/src/sjl.bitbucket.org/conserve
- hg -R ~/src/sjl.bitbucket.org commit -Am 'conserve: Update site.'
- hg -R ~/src/sjl.bitbucket.org push
+# pubdocs: docs
+# hg -R ~/src/sjl.bitbucket.org pull -u
+# rsync --delete -a ./docs/build/ ~/src/sjl.bitbucket.org/conserve
+# hg -R ~/src/sjl.bitbucket.org commit -Am 'conserve: Update site.'
+# hg -R ~/src/sjl.bitbucket.org push
--- a/test/run.lisp Wed Dec 26 21:24:37 2018 -0500
+++ b/test/run.lisp Wed Dec 26 21:37:47 2018 -0500
@@ -1,5 +1,5 @@
#+ecl (setf compiler:*user-cc-flags* "-Wno-shift-negative-value")
-(ql:quickload :trivial-csv :silent t)
-(time (asdf:test-system :trivial-csv))
+(ql:quickload :conserve :silent t)
+(time (asdf:test-system :conserve))
(quit)
--- a/test/tests.lisp Wed Dec 26 21:24:37 2018 -0500
+++ b/test/tests.lisp Wed Dec 26 21:37:47 2018 -0500
@@ -2,8 +2,9 @@
;;;; Utils --------------------------------------------------------------------
-(defun symb (&rest args)
- (intern (apply #'concatenate 'string (mapcar #'princ-to-string args))))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (defun symb (&rest args)
+ (intern (apply #'concatenate 'string (mapcar #'princ-to-string args)))))
(defmacro define-test (name &body body)
`(test ,(symb 'test- name)
@@ -36,7 +37,7 @@
(defun cl-csv-read-string (string)
(cl-csv:read-csv string
- :newline (string #\newline)
+ :newline #\newline
:trim-outer-whitespace nil))