tests: fix target check

Use wget to download tests (ecl-curl failed on https), use ecl
binaries and libs from installation directory and fix tests target
order.

Signed-off-by: Daniel Kochmański <dkochmanski@turtle-solutions.eu>
This commit is contained in:
Daniel Kochmański 2015-06-19 19:45:54 +02:00
parent 673c9bc973
commit 21e02f53a8
2 changed files with 10 additions and 9 deletions

View file

@ -1,16 +1,15 @@
ECL=ecl@EXEEXT@
ECL=@prefix@/@bindir@/ecl@EXEEXT@
all: output.ecl/ansi.log output.ecl/regressions.log
all: show-fails
.PHONY: do-ansi do-regressions do-quicklisp cleanup clean-sources update
BUGS_FILES := $(shell find ../../src/tests/bugs/ -type f)
output.ecl/ansi.log: config.lsp
$(MAKE) do-ansi
$(MAKE) show-fails
output.ecl/regressions.log: config.lsp
$(MAKE) do-regressions
$(MAKE) show-fails
do-ansi: ansi-tests config.lsp
$(ECL) -norc -load config.lsp -eval '(ecl-tests::run-ansi-tests)' -eval '(ext:quit)' < /dev/null
@ -21,20 +20,22 @@ do-quicklisp: quicklisp config.lsp
do-mop-tests: mop-features config.lsp
$(ECL) -norc -load config.lsp -eval '(ecl-tests::run-mop-tests)' -eval '(ext:quit)' < /dev/null
show-fails:
show-fails: output.ecl/ansi.log output.ecl/regressions.log
grep "^Test .* failed" output.ecl/ansi.log output.ecl/regressions.log
#
# Create directories
#
ansi-tests: config.lsp
wget "http://common-lisp.net/project/ecl/tests/ansi-tests.tar.gz" -P cache
$(ECL) -norc -load config.lsp -eval '(ecl-tests::ensure-ansi-tests)' -eval '(ext:quit)' < /dev/null
mop-features: config.lsp
wget "http://common-lisp.net/project/ecl/tests/mop-features.tar.gz" -P cache
$(ECL) -norc -load config.lsp -eval '(ecl-tests::ensure-mop-tests)' -eval '(ext:quit)' < /dev/null
regressions: config.lsp ansi-tests $(BUGS_FILES)
$(ECL) -norc -load config.lsp -eval '(ecl-tests::ensure-regressions)' -eval '(ext:quit)' < /dev/null
quicklisp: config.lsp
$(ECL) -norc -load config.lsp -eval '(ecl-tests::ensure-quicklisp)' -eval '(ext:quit)' < /dev/null
mop-features: config.lsp
$(ECL) -norc -load config.lsp -eval '(ecl-tests::ensure-mop-tests)' -eval '(ext:quit)' < /dev/null
#
# Test other implementations

View file

@ -15,7 +15,7 @@
(defvar *ecl-sources*
(loop for *default-pathname-defaults* in
'(#p"@true_srcdir@/" #p"../../" #p"../../src/")
when (probe-file "CHANGELOG")
when (probe-file "configure.ac")
return *default-pathname-defaults*))
(defvar *test-sources* (merge-pathnames "tests/" *ecl-sources*))
@ -28,7 +28,7 @@
#+windows
(namestring (truename #+windows "sys:ecl.exe"))
#-windows
"ecl"))
"@prefix@/bin/ecl"))
(defvar *test-image-args*
(cond ((search "ecl" *test-image*)