diff --git a/test/script-support.lisp b/test/script-support.lisp index 22bb2157308fae487c3f68ee8dc6dd838553a9c5..fbee214e867aa7d74e9f9650355b0bee2762ca75 100644 --- a/test/script-support.lisp +++ b/test/script-support.lisp @@ -36,7 +36,7 @@ Some constraints: (declaim (optimize (speed 2) (safety #-gcl 3 #+gcl 1) #-(or allegro gcl genera) (debug 3) #+(or cmu scl) (c::brevity 2))) (proclaim '(optimize (speed #-gcl 2 #+gcl 1) (safety #-gcl 3 #+gcl 1) #-(or allegro gcl genera) (debug 3) - #+(or cmu scl) (c::brevity 2))) + #+(or cmu scl) (c::brevity 2) #+(or cmu scl) (ext:inhibit-warnings 3))) (defvar *trace-symbols* `(;; If you want to trace some stuff while debugging ASDF, diff --git a/test/test-utilities.script b/test/test-utilities.script index 32243e4ec7b6aa0a76cdb521a53170f61eeb0207..b2a5eb576b81c224b1ba7112d758f2a3be425c0e 100644 --- a/test/test-utilities.script +++ b/test/test-utilities.script @@ -34,8 +34,7 @@ (assert (version-satisfies (find-system :test-asdf) "666")) (handler-case (version-satisfies (find-system :test-asdf) "666") (simple-warning (c) - (assert-equal (simple-condition-format-control c) - "Requested version ~S but ~S has no version")) + (assert (search "Requested version ~S but ~S has no version" (simple-condition-format-control c)))) (:no-error (x) (error "version-satisfies must warn when given component without version"))) (assert (version<= "2.0" (asdf-version))) @@ -234,6 +233,8 @@ (assert (not (base-string-p (strcat (basify "ab") #\c *last-char* (unbasify "d"))))) (assert (base-string-p (strcat (basify "ab") #\c #\d)))) +(assert-pathname-equal *test-directory* (getcwd)) + (assert-equal +crlf+ (map 'string 'code-char '(13 10))) (assert-equal +lf+ (map 'string 'code-char '(10))) (assert-equal +cr+ (map 'string 'code-char '(13))) diff --git a/uiop/os.lisp b/uiop/os.lisp index 1f0767d55a5f406e761911b6bb41a6f01a044ac5..b97242bd0c22b3f19009ed99e97a9131e02781ba 100644 --- a/uiop/os.lisp +++ b/uiop/os.lisp @@ -246,8 +246,9 @@ suitable for use as a directory name to segregate Lisp FASLs, C dynamic librarie (defun getcwd () "Get the current working directory as per POSIX getcwd(3), as a pathname object" - (or #+abcl (parse-native-namestring - (java:jstatic "getProperty" "java.lang.System" "user.dir") :ensure-directory t) + (or #+abcl (symbol-call :asdf/filesystem :parse-native-namestring + (java:jstatic "getProperty" "java.lang.System" "user.dir") + :ensure-directory t) #+allegro (excl::current-directory) #+clisp (ext:default-directory) #+clozure (ccl:current-directory)