Skip to content
Snippets Groups Projects
Commit 160a8398 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Fix upgrade tests for GCL 2.6.

parent 47a234ba
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ sourceDirectory := $(shell pwd) ...@@ -7,7 +7,7 @@ sourceDirectory := $(shell pwd)
ifdef ASDF_TEST_LISPS ifdef ASDF_TEST_LISPS
lisps ?= ${ASDF_TEST_LISPS} lisps ?= ${ASDF_TEST_LISPS}
else else
lisps ?= ccl clisp sbcl ecl ecl_bytecodes cmucl abcl scl allegro lispworks allegromodern xcl lisps ?= ccl clisp sbcl ecl ecl_bytecodes cmucl abcl scl allegro lispworks allegromodern xcl gcl
endif endif
export ASDF_OUTPUT_TRANSLATIONS := (:output-translations (t ("${sourceDirectory}/tmp/fasls" :implementation)) :ignore-inherited-configuration) export ASDF_OUTPUT_TRANSLATIONS := (:output-translations (t ("${sourceDirectory}/tmp/fasls" :implementation)) :ignore-inherited-configuration)
...@@ -100,7 +100,7 @@ test-upgrade: ...@@ -100,7 +100,7 @@ test-upgrade:
use_abcl () { li="${ABCL} --noinit --nosystem --noinform" ; ev="--eval" ; } ; \ use_abcl () { li="${ABCL} --noinit --nosystem --noinform" ; ev="--eval" ; } ; \
use_xcl () { li="${XCL} --noinit --nosystem --noinform" ; ev="--eval" ; } ; \ use_xcl () { li="${XCL} --noinit --nosystem --noinform" ; ev="--eval" ; } ; \
use_scl () { li="${SCL} -noinit" ; ev="-eval" ; } ; \ use_scl () { li="${SCL} -noinit" ; ev="-eval" ; } ; \
use_gcl () { li="GCL_ANSI=t ${GCL}" ; ev="-eval" ; } ; \ use_gcl () { li="env GCL_ANSI=t ${GCL}" ; ev="-eval" ; } ; \
use_allegro () { li="${ALLEGRO} -q" ; ev="-e" ; } ; \ use_allegro () { li="${ALLEGRO} -q" ; ev="-e" ; } ; \
use_allegromodern () { li="${ALLEGROMODERN} -q" ; ev="-e" ; } ; \ use_allegromodern () { li="${ALLEGROMODERN} -q" ; ev="-e" ; } ; \
use_lispworks () { li="${LISPWORKS} -siteinit - -init -" ; ev="-eval" ; } ; \ use_lispworks () { li="${LISPWORKS} -siteinit - -init -" ; ev="-eval" ; } ; \
...@@ -114,7 +114,7 @@ test-upgrade: ...@@ -114,7 +114,7 @@ test-upgrade:
echo "Testing upgrade from ASDF $${tag} using method $$x" ; \ echo "Testing upgrade from ASDF $${tag} using method $$x" ; \
git show $${tag}:asdf.lisp > tmp/asdf-$${tag}.lisp ; \ git show $${tag}:asdf.lisp > tmp/asdf-$${tag}.lisp ; \
case ${lisp}:$$tag:$$x in \ case ${lisp}:$$tag:$$x in \
abcl:2.0[01][1-9]|abcl:2.2[1-2]:*) \ abcl:2.0[01][1-9]:*|abcl:2.2[1-2]:*) \
: Skip, because it is so damn slow ;; \ : Skip, because it is so damn slow ;; \
ccl:1.*|ccl:2.0[01]*) \ ccl:1.*|ccl:2.0[01]*) \
: Skip, because ccl broke old asdf ;; \ : Skip, because ccl broke old asdf ;; \
...@@ -122,6 +122,7 @@ test-upgrade: ...@@ -122,6 +122,7 @@ test-upgrade:
: Skip, CMUCL has problems before 2.014.7 due to source-registry upgrade ;; \ : Skip, CMUCL has problems before 2.014.7 due to source-registry upgrade ;; \
ecl*:1.*|ecl*:2.0[01]*|ecl*:2.20:*) \ ecl*:1.*|ecl*:2.0[01]*|ecl*:2.20:*) \
: Skip, because of various ASDF issues ;; \ : Skip, because of various ASDF issues ;; \
gcl:1.*|gcl:2.0*|gcl:2.2[0-6]*) : Skip old versions that do not support GCL 2.6 ;; \
mkcl:1.*|mkcl:2.0[01]*|mkcl:2.2[0-3]:*) \ mkcl:1.*|mkcl:2.0[01]*|mkcl:2.2[0-3]:*) \
: Skip, because MKCL is only supported starting with 2.24 ;; \ : Skip, because MKCL is only supported starting with 2.24 ;; \
xcl:1.*|xcl:2.00*|xcl:2.01[0-4]:*|xcl:*) \ xcl:1.*|xcl:2.00*|xcl:2.01[0-4]:*|xcl:*) \
......
...@@ -52,14 +52,14 @@ ...@@ -52,14 +52,14 @@
#+scl :scl #+scl :scl
#+xcl :xcl)))) #+xcl :xcl))))
(merge-pathnames (merge-pathnames
(make-pathname :directory `(#-gcl<2.7 :relative "tmp" "fasls" ,impl) (make-pathname :directory `(#-gcl :relative "tmp" "fasls" ,impl)
:defaults *asdf-directory*) :defaults *asdf-directory*)
*asdf-lisp*)))) *asdf-lisp*))))
(defun load-old-asdf (tag) (defun load-old-asdf (tag)
(let ((old-asdf (let ((old-asdf
(merge-pathnames (merge-pathnames
(make-pathname :directory `(#-gcl<2.7 :relative "tmp") (make-pathname :directory `(#-gcl :relative "tmp")
:name (format nil "asdf-~A" tag) :name (format nil "asdf-~A" tag)
:defaults *asdf-directory*) :defaults *asdf-directory*)
*asdf-lisp*))) *asdf-lisp*)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment