diff --git a/test/asdf-pathname-test.script b/test/asdf-pathname-test.script index 335a169aaf01e0287c4b7fa2bfb064821b4a586a..bb2a93e3d6b3ceabad3863923719e76cca75cbe5 100644 --- a/test/asdf-pathname-test.script +++ b/test/asdf-pathname-test.script @@ -4,7 +4,7 @@ (in-package :asdf-pathname-test) (eval-when (:compile-toplevel :load-toplevel :execute) - #-xcl (push :asdf-test-logical-pathname *features*) + #-(or xcl gcl) (push :asdf-test-logical-pathname *features*) #+xcl (push :buggy-untyped-file *features*)) ;;(setf *unspecific-pathname-type* nil) @@ -423,20 +423,20 @@ (asdf:initialize-output-translations) (format t "output translations: ~S~%" (asdf::output-translations)) -(progn - ;; we're testing with unix or some emulation, are we not? - (assert-pathname-equal (resolve-location '(:home)) (truename (user-homedir-pathname))) - (assert-pathname-equal (resolve-location '("/foo" "bar" "baz")) #p"/foo/bar/baz") - (assert-pathname-equal (resolve-location '("/foo" "bar" "baz") :ensure-directory t) #p"/foo/bar/baz/") - (assert-pathname-equal (resolve-location '("/foo" "bar" "baz") :ensure-directory t :wilden t) (wilden #p"/foo/bar/baz/")) - (assert-pathname-equal (resolve-location '("/foo" "bar" "baz") :ensure-directory nil :wilden t) (wilden #p"/foo/bar/")) - (assert-pathname-equal (resolve-location '("/foo" "bar" :**/ "baz" #p"*.*") :ensure-directory nil :wilden t) #p"/foo/bar/**/baz/*.*") +;; we're testing with unix or some emulation, are we not? - (assert (directory-pathname-p (system-source-directory (find-system :test-asdf/test-source-directory-1)))) - (assert (directory-pathname-p (system-source-directory (find-system :test-asdf/test-source-directory-2)))) +(assert-pathname-equal (resolve-location '(:home)) (truename (user-homedir-pathname))) +(assert-pathname-equal (resolve-location '("/foo" "bar" "baz")) #p"/foo/bar/baz") +(assert-pathname-equal (resolve-location '("/foo" "bar" "baz") :ensure-directory t) #p"/foo/bar/baz/") +(assert-pathname-equal (resolve-location '("/foo" "bar" "baz") :ensure-directory t :wilden t) (wilden #p"/foo/bar/baz/")) +(assert-pathname-equal (resolve-location '("/foo" "bar" "baz") :ensure-directory nil :wilden t) (wilden #p"/foo/bar/")) +(assert-pathname-equal (resolve-location '("/foo" "bar" :**/ "baz" #p"*.*") :ensure-directory nil :wilden t) #p"/foo/bar/**/baz/*.*") - (or (test-component-pathnames :delete-host t :support-string-pathnames nil) - (leave-test "test failed" 1))) +(assert (directory-pathname-p (system-source-directory (find-system :test-asdf/test-source-directory-1)))) +(assert (directory-pathname-p (system-source-directory (find-system :test-asdf/test-source-directory-2)))) + +#-gcl +(assert (test-component-pathnames :delete-host t :support-string-pathnames nil)) #| (load "LIBRARY:de;setf;utility;asdf;cp-test.lisp") diff --git a/test/test-compile-file-failure.script b/test/test-compile-file-failure.script index 368937de562504b4f7c11e43b1daf236788275c0..1cb0e30760f7d0a01eda3ee3af90779945897430 100644 --- a/test/test-compile-file-failure.script +++ b/test/test-compile-file-failure.script @@ -4,11 +4,12 @@ :components ((:file "test-compile-file-failure"))) (assert (handler-case - (let ((*compile-file-failure-behaviour* :warn)) - (load-system 'test-compile-file-failure :force t) - t) + (let ((*compile-file-failure-behaviour* :warn)) + (load-system 'test-compile-file-failure :force t) + t) (compile-file-error () nil))) +#-gcl (assert (handler-case (let ((*compile-file-failure-behaviour* :error)) (load-system 'test-compile-file-failure :force t) diff --git a/test/test-logical-pathname.script b/test/test-logical-pathname.script index b67c572cf2f120ad2cdd242d44b127bc2e0f2176..897877aeffb1afc9fc80d17af4b414414c6abf7a 100644 --- a/test/test-logical-pathname.script +++ b/test/test-logical-pathname.script @@ -17,7 +17,7 @@ (translate-logical-pathname "ASDF:test;test-logical-pathname.asd") (truename "ASDF:test;test-logical-pathname.asd")) -#+xcl (leave-test "GCL 2.6 doesn't do Logical pathnames well enough" 0) +#+(or gcl xcl) (leave-test "This implementation doesn't do Logical pathnames well enough" 0) (DBG "Test logical pathnames in central registry") (setf *central-registry* '(#p"ASDF:test;"))