Commit 464784a7 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

2.015.10: slight hot upgrade improvement. Better upgrade tests.

parent ed4cd329

Makefile

+13 −4
Original line number Diff line number Diff line
@@ -62,13 +62,22 @@ test-upgrade: 
	if [ -f /usr/lib/sbcl/sbcl-dist.core ] ; then \

		SBCL="/usr/bin/sbcl --core /usr/lib/sbcl/sbcl-dist.core" ; fi ; \

	mkdir -p tmp/ ; \

        fa=tmp/fasls/sbcl/upasdf.fasl ; \

        ll="(handler-bind ((sb-kernel:redefinition-warning #'muffle-warning)) (load \"asdf.lisp\"))" ; \

	cf="(handler-bind ((warning #'muffle-warning)) (compile-file \"asdf.lisp\" :output-file \"$$fa\" :verbose nil :print nil))" ; \

        lf="(handler-bind ((sb-kernel:redefinition-warning #'muffle-warning)) (load \"$$fa\"))" ; \

        te="(quit-on-error $$l (push #p\"${sourceDirectory}/test/\" asdf:*central-registry*) (asdf:oos 'asdf:load-op :test-module-depend :verbose nil))" ; \

        sb="$${SBCL:-sbcl} --noinform --load test/script-support" ; \

	for tag in 1.37 1.97 1.369 `git tag -l '2.0??'` ; do \

	  lo="(handler-bind ((warning #'muffle-warning)) (load \"tmp/asdf-$${tag}.lisp\"))" ; \

	  echo "Testing upgrade from ASDF $${tag}" ; \

	  git show $${tag}:asdf.lisp > tmp/asdf-$${tag}.lisp ; \

	  $${SBCL:-sbcl} --noinform --eval \

	'(progn (handler-bind ((t #'"'"'muffle-warning)) (load "tmp/asdf-'$${tag}'.lisp")) (handler-bind ((sb-kernel:redefinition-warning #'"'"'muffle-warning)((or warning error) (lambda (c) (format t "~A~%" c) #|(defparameter *c* c) (break)|# (sb-ext:quit :unix-status 1)))) (load "asdf.lisp") (format t "Successfully upgraded from '$${tag}'~%")))' \

	--eval '(progn (push #p"${sourceDirectory}/test/" asdf:*central-registry*) (asdf:load-system :test-module-depend) (sb-ext:quit :unix-status 0))' || \

	{ echo "FAILED" ; exit 1 ; } ; done

          rm -f $$fa ; \

          ( set -x ; $$sb --eval "$$lo" --eval "$$ll" --eval "$$te" && \

          $$sb --eval "$$lo" --eval "$$cf" --eval "$$lf" --eval "$$te" && \

          $$sb --eval "$$lo" --eval "$$lf" --eval "$$te" && \

          $$sb --eval "$$lf" --eval "$$te" ) || { echo "upgrade FAILED" ; exit 1 ;}; \

        done



test-forward-references:

	if [ -f /usr/lib/sbcl/sbcl-dist.core ] ; then SBCL="/usr/bin/sbcl --core /usr/lib/sbcl/sbcl-dist.core" ; fi ; $${SBCL:-sbcl} --noinform --load ~/cl/asdf/asdf.lisp --eval '(sb-ext:quit)' 2>&1 | cmp - /dev/null

asdf.asd

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  :licence "MIT"

  :description "Another System Definition Facility"

  :long-description "ASDF builds Common Lisp software organized into defined systems."

  :version "2.015.9" ;; to be automatically updated by bin/bump-revision

  :version "2.015.10" ;; to be automatically updated by bin/bump-revision

  :depends-on ()

  :components

  ((:file "asdf")

asdf.lisp

+3 −3
Original line number Diff line number Diff line 
;;; -*- mode: common-lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-

;;; This is ASDF 2.015.9: Another System Definition Facility.

;;; This is ASDF 2.015.10: Another System Definition Facility.

;;;

;;; Feedback, bug reports, and patches are all welcome:

;;; please mail to <asdf-devel@common-lisp.net>.
@@ -106,8 +106,8 @@ 
         ;; "2.345.6" would be a development version in the official upstream

         ;; "2.345.0.7" would be your seventh local modification of official release 2.345

         ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6

         (asdf-version "2.015.9")

         (existing-asdf (fboundp 'find-system))

         (asdf-version "2.015.10")

         (existing-asdf (find-class 'component nil))

         (existing-version *asdf-version*)

         (already-there (equal asdf-version existing-version)))

    (unless (and existing-asdf already-there)