Commit 2d10c182 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Merge branch 'master' of http://common-lisp.net/project/asdf/asdf

Conflicts:
	test/test-source-file-type.script
parents 85925550 9ed08a9d
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@
(load "script-support.lisp")
(load-asdf)

#+allegro
(trace asdf::source-file-explicit-type asdf::source-file-type
       asdf:component-pathname asdf:component-relative-pathname)

(quit-on-error
 (setf asdf:*central-registry* '(*default-pathname-defaults*))
 (asdf:load-system 'test-source-file-type-1 :verbose t)
 (assert (symbol-value (read-from-string "test-package::*test-tmp-cl*")))
 (assert
   (equal (mapcar #'pathname-type
                  (mapcar #'asdf:component-pathname (asdf:module-components (asdf:find-system :test-source-file-type-1))))
          '("lisp" "cl")))
 (delete-package :test-package)
 (asdf:load-system 'test-source-file-type-2 :verbose t)
 (assert (symbol-value (read-from-string "test-package::*test-tmp-cl*"))))