From 4b8e6a632ce7d498bf97afde68463f7c409eb7ed Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Fri, 11 Jan 2013 00:43:51 -0500 Subject: [PATCH] 2.26.73: fix a logical-pathname issue on ECL. Also, tweak some tests some more. --- system.lisp | 3 ++- test/test-force.script | 1 + test/test-logical-pathname.script | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/system.lisp b/system.lisp index 6fef6cbb..d104595c 100644 --- a/system.lisp +++ b/system.lisp @@ -140,6 +140,7 @@ located." (defmethod builtin-system-p ((s system)) (let* ((system (find-system s nil)) (sysdir (and system (component-pathname system))) + (truesysdir (and sysdir (truename* sysdir))) (impdir (lisp-implementation-directory :truename t))) - (and sysdir impdir (pathname-match-p (truename sysdir) (wilden impdir)) t))) + (and truesysdir impdir (pathname-match-p truesysdir (wilden impdir)) t))) diff --git a/test/test-force.script b/test/test-force.script index 50f18c4e..88fd9bba 100644 --- a/test/test-force.script +++ b/test/test-force.script @@ -15,6 +15,7 @@ (assert file1-date) ;; unforced, date should stay same + (touch-file "test-force.asd" :timestamp date1) (touch-file "file1.lisp" :timestamp date1) (touch-file file1 :timestamp date2) (asdf:operate 'asdf:load-op 'test-force) diff --git a/test/test-logical-pathname.script b/test/test-logical-pathname.script index 4e79e08b..bc3eced4 100644 --- a/test/test-logical-pathname.script +++ b/test/test-logical-pathname.script @@ -31,7 +31,7 @@ (setf *central-registry* '()) (initialize-source-registry '(:source-registry (:directory #p"ASDF:test;") :ignore-inherited-configuration)) - (load-system :test-logical-pathname :force t)) + (load-system :test-logical-pathname :force t :verbose t)) #-(or xcl gcl<2.7) (progn -- GitLab