Commit 843d15ed authored by Robert Goldman's avatar Robert Goldman
Browse files

Merge branch 'cmucl-user-homedir-pathname' 

* cmucl-user-homedir-pathname:
  test for USER-HOMEDIR-PATHNAME cmucl issue.
  USER-HOMEDIR-PATHNAME patch for CMUCL.
parents a13aee3b e32aedb7

test/asdf-pathname-test.script

+8 −0
Changes for test/asdf-pathname-test.script: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -464,3 +464,11 @@ 


#+os-unix

(test-pathname-parsing)



;;; test for CMUCL issue with search lists versus pathnames

(DBG "Checking CMUCL user-homedir-pathname issue.")

(assert

 (multiple-value-bind (value error)

     (ignore-errors

      (pathname-match-p (uiop::user-homedir-pathname) (uiop:getenv "HOME")))

   (null error)))

uiop/common-lisp.lisp

+4 −2
Changes for uiop/common-lisp.lisp: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
   #:make-broadcast-stream #:file-namestring)

  #+genera (:shadowing-import-from :scl #:boolean)

  #+genera (:export #:boolean #:ensure-directories-exist #:read-sequence #:write-sequence)

  #+mcl (:shadow #:user-homedir-pathname))

  #+(or mcl cmucl) (:shadow #:user-homedir-pathname))

(in-package :uiop/common-lisp)



#-(or abcl allegro clasp clisp clozure cmucl cormanlisp ecl gcl genera lispworks mcl mkcl sbcl scl xcl)
@@ -73,7 +73,9 @@ 


#+cmucl

(eval-when (:load-toplevel :compile-toplevel :execute)

  (setf ext:*gc-verbose* nil))

  (setf ext:*gc-verbose* nil)

  (defun user-homedir-pathname ()

    (first (ext:search-list (cl:user-homedir-pathname)))))



#+cormanlisp

(eval-when (:load-toplevel :compile-toplevel :execute)