# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1509676370 14400
# Node ID ca108d2f3b7947f2f557dc9798eb0f0dbc6bdbb9
# Parent  b006652f8a180e478171e8e4b2343223365d1e42
Clean up test running to expunge Roswell

diff -r b006652f8a18 -r ca108d2f3b79 Makefile
--- a/Makefile	Fri Jun 23 13:46:43 2017 +0000
+++ b/Makefile	Thu Nov 02 22:32:50 2017 -0400
@@ -3,6 +3,7 @@
 sourcefiles = $(shell ffind --full-path --literal .lisp)
 docfiles = $(shell ls docs/*.markdown)
 apidocs = $(shell ls docs/*reference*.markdown)
+heading_printer = $(shell which heading || echo 'true')
 
 # Vendor ----------------------------------------------------------------------
 vendor/quickutils.lisp: vendor/make-quickutils.lisp
@@ -13,20 +14,20 @@
 # Testing ---------------------------------------------------------------------
 test: test-sbcl test-ccl test-ecl test-abcl
 
-test-sbcl:
-	echo; figlet -kf computer 'SBCL' | sed -Ee 's/ +$$//' | tr -s '\n' | lolcat --freq=0.25; echo
-	ros run -L sbcl --load test/run.lisp
+test-sbcl: vendor
+	$(heading_printer) computer 'SBCL'
+	sbcl --load test/run.lisp
 
-test-ccl:
-	echo; figlet -kf slant 'CCL' | sed -Ee 's/ +$$//' | tr -s '\n' | lolcat --freq=0.25; echo
-	ros run -L ccl-bin --load test/run.lisp
+test-ccl: vendor
+	$(heading_printer) slant 'CCL'
+	ccl --load test/run.lisp
 
-test-ecl:
-	echo; figlet -kf roman 'ECL' | sed -Ee 's/ +$$//' | tr -s '\n' | lolcat --freq=0.25; echo
-	ros run -L ecl --load test/run.lisp
+test-ecl: vendor
+	$(heading_printer) roman 'ECL'
+	ecl --load test/run.lisp
 
-test-abcl:
-	echo; figlet -kf broadway 'ABCL' | sed -Ee 's/ +$$//' | tr -s '\n' | lolcat --freq=0.25; echo
+test-abcl: vendor
+	$(heading_printer) broadway 'ABCL'
 	abcl --load test/run.lisp
 
 # Documentation ---------------------------------------------------------------
diff -r b006652f8a18 -r ca108d2f3b79 test/run.lisp
--- a/test/run.lisp	Fri Jun 23 13:46:43 2017 +0000
+++ b/test/run.lisp	Thu Nov 02 22:32:50 2017 -0400
@@ -1,4 +1,4 @@
-#+ecl (setf compiler:*user-cc-flags* "-Wno-shift-negative-value")
+#+ecl (setf compiler::*user-cc-flags* "-Wno-shift-negative-value")
 
 (ql:quickload 'chancery)
 (time (asdf:test-system 'chancery))
diff -r b006652f8a18 -r ca108d2f3b79 test/tests.lisp
--- a/test/tests.lisp	Fri Jun 23 13:46:43 2017 +0000
+++ b/test/tests.lisp	Thu Nov 02 22:32:50 2017 -0400
@@ -72,4 +72,4 @@
   (is (eql (sample-rule) :foo))
   (is (string= (sample-string) "Hello FOO")))
 
-;; (run-tests)
+(run-tests)