Changeset 12948 for trunk/abcl/test/lisp/abcl/pathname-tests.lisp

Timestamp:

10/03/10 21:42:09 (12 years ago)

Author:

ehuelsmann

Message:

Fix test expectations due to us now generating forward slashes
in our printed pathnames, even on Windows.

File:

• trunk/abcl/test/lisp/abcl/pathname-tests.lisp (modified) (11 diffs)

trunk/abcl/test/lisp/abcl/pathname-tests.lisp

@@ -100 +100 @@
   (let ((result (namestring (apply 'translate-pathname args))))
     (equal result
-           #-windows expected
-           #+windows (substitute #\\ #\/ expected))))
+           ;;#-windows
+           expected
+           ;;#+windows (substitute #\\ #\/ expected)
+           )))
 
 (defmacro check-readable (pathname)
@@ -113 +115 @@
 (defmacro check-namestring (pathname namestring)
   `(string= (namestring ,pathname)
-            #+windows (substitute #\\ #\/ ,namestring)
-            #-windows ,namestring))
+            ;;#+windows (substitute #\\ #\/ ,namestring)
+            ;;#-windows
+            ,namestring))
 
 ;; Define a logical host.
@@ -308 +311 @@
 
 (deftest directory-namestring.1
-  (equal (directory-namestring #-windows #p"./"
-                               #+windows #p".\\")
-         #-windows "./"
-         #+windows ".\\")
+  (equal (directory-namestring #p"./")
+         "./")
   t)
 #+lispworks
@@ -385 +386 @@
   (equal (directory-namestring #-windows #p"../"
                                #+windows #p"..\\")
-         #-windows "../"
-         #+windows "..\\")
+         "../")
   t)
 
@@ -403 +403 @@
 (deftest physical.31
   (string= (namestring (make-pathname :directory '(:relative :up)))
-           #+windows "..\\"
-           #-windows "../")
+           "../")
   t)
 
@@ -919 +918 @@
 (deftest translate-pathname.12
   (string= (namestring (translate-pathname "foo.bar" "*.*" "/usr/local/*.*"))
-           #-windows "/usr/local/foo.bar"
-           #+windows "\\usr\\local\\foo.bar")
+           "/usr/local/foo.bar")
   t)
 
@@ -1119 +1117 @@
   (equal (enough-namestring #p"foo/bar" #p"foo") "foo/bar")
   #+windows
-  (equal (enough-namestring #p"foo\\bar" #p"foo") "foo\\bar")
+  (equal (enough-namestring #p"foo\\bar" #p"foo") "foo/bar")
   t)
 
@@ -1252 +1250 @@
   #-clisp
   (equal (namestring (translate-logical-pathname "demo0:x.y"))
-         #-windows "/tmp/x.y"
-         #+windows "\\tmp\\x.y")
+         ;;#-windows
+         "/tmp/x.y"
+         ;;#+windows "\\tmp\\x.y"
+         )
   t)
 
@@ -1627 +1627 @@
 (deftest sbcl.59
   (string= (with-standard-io-syntax (write-to-string #p"/foo"))
-           #-windows "#P\"/foo\""
-           #+(and windows (not lispworks)) "#P\"\\\\foo\""
-           #+(and windows lispworks) "#P\"/foo\"")
+           ;;#-windows "#P\"/foo\""
+           ;;#+(and windows (not lispworks)) "#P\"\\\\foo\""
+           ;;#+(and windows lispworks)
+           "#P\"/foo\"")
   t)
 
@@ -1635 +1636 @@
 (deftest sbcl.60
   (string= (with-standard-io-syntax (write-to-string #p"/foo" :readably nil))
-           #-windows "#P\"/foo\""
-           #+(and windows (not lispworks)) "#P\"\\\\foo\""
-           #+(and windows lispworks) "#P\"/foo\"")
+           ;;#-windows
+           "#P\"/foo\""
+           ;;#+(and windows (not lispworks)) "#P\"\\\\foo\""
+           ;;#+(and windows lispworks) "#P\"/foo\""
+           )
   t)
 
@@ -1643 +1646 @@
 (deftest sbcl.61
   (string= (with-standard-io-syntax (write-to-string #p"/foo" :escape nil))
-           #-windows "#P\"/foo\""
-           #+(and windows (not lispworks)) "#P\"\\\\foo\""
-           #+(and windows lispworks) "#P\"/foo\"")
+           ;;#-windows
+           "#P\"/foo\""
+           ;;#+(and windows (not lispworks)) "#P\"\\\\foo\""
+           ;;#+(and windows lispworks) "#P\"/foo\""
+           )
   t)
 
 (deftest sbcl.62
   (string= (with-standard-io-syntax (write-to-string #p"/foo" :readably nil :escape nil))
-           #-windows "/foo"
-           #+windows "\\foo")
-  t)
+           ;;#-windows
+           "/foo"
+           ;;#+windows "\\foo"
+           )
+  t)