Skip to content
Snippets Groups Projects
Commit f1f3f537 authored by Robert P. Goldman's avatar Robert P. Goldman
Browse files

Removed unused code causing tests to fail.

In system-configuration-directories the FLET function was only run on
windows.  On non-windows, at least on ACL, this was causing compilation
warnings, and hence test failures.  Juggled the position of the #+windows
to fix this.
parent baadd38b
No related branches found
No related tags found
No related merge requests found
...@@ -2187,13 +2187,15 @@ output to `*verbose-out*`. Returns the shell's exit code." ...@@ -2187,13 +2187,15 @@ output to `*verbose-out*`. Returns the shell's exit code."
(defun system-configuration-directories () (defun system-configuration-directories ()
(remove-if (remove-if
#'null #'null
(flet ((try (x sub) (try-directory-subpath x sub :type :directory))) (append
`(#+windows #+windows
(flet ((try (x sub) (try-directory-subpath x sub :type :directory)))
`(
,@`(#+lispworks ,(try (sys:get-folder-path :local-appdata) "common-lisp/config/") ,@`(#+lispworks ,(try (sys:get-folder-path :local-appdata) "common-lisp/config/")
;;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Common AppData ;;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Common AppData
#+(not cygwin) #+(not cygwin)
,(try (getenv "ALLUSERSPROFILE") "Application Data/common-lisp/config/")) ,(try (getenv "ALLUSERSPROFILE") "Application Data/common-lisp/config/"))))
#p"/etc/")))) (list #p"/etc/"))))
(defun in-first-directory (dirs x) (defun in-first-directory (dirs x)
(loop :for dir :in dirs (loop :for dir :in dirs
:thereis (and dir (ignore-errors (truename (merge-pathnames* x (ensure-directory-pathname dir))))))) :thereis (and dir (ignore-errors (truename (merge-pathnames* x (ensure-directory-pathname dir)))))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment