Changeset 12948


Ignore:
Timestamp:
10/03/10 21:42:09 (11 years ago)
Author:
ehuelsmann
Message:

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

Location:
trunk/abcl/test/lisp/abcl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/test/lisp/abcl/jar-pathname.lisp

    r12654 r12948  
    5858                 (merge-pathnames "eek.lisp" sub))
    5959      (sys:zip (merge-pathnames "baz.jar")
    60                (append
    61                 (directory (merge-pathnames "*" dir))
    62                 (directory (merge-pathnames "*" sub)))
     60               (print (append
     61                       (directory (merge-pathnames "*" dir))
     62                       (directory (merge-pathnames "*" sub))))
    6363               dir)
    6464      (delete-directory-and-files dir)))
  • trunk/abcl/test/lisp/abcl/pathname-tests.lisp

    r11599 r12948  
    100100  (let ((result (namestring (apply 'translate-pathname args))))
    101101    (equal result
    102            #-windows expected
    103            #+windows (substitute #\\ #\/ expected))))
     102           ;;#-windows
     103           expected
     104           ;;#+windows (substitute #\\ #\/ expected)
     105           )))
    104106
    105107(defmacro check-readable (pathname)
     
    113115(defmacro check-namestring (pathname namestring)
    114116  `(string= (namestring ,pathname)
    115             #+windows (substitute #\\ #\/ ,namestring)
    116             #-windows ,namestring))
     117            ;;#+windows (substitute #\\ #\/ ,namestring)
     118            ;;#-windows
     119            ,namestring))
    117120
    118121;; Define a logical host.
     
    308311
    309312(deftest directory-namestring.1
    310   (equal (directory-namestring #-windows #p"./"
    311                                #+windows #p".\\")
    312          #-windows "./"
    313          #+windows ".\\")
     313  (equal (directory-namestring #p"./")
     314         "./")
    314315  t)
    315316#+lispworks
     
    385386  (equal (directory-namestring #-windows #p"../"
    386387                               #+windows #p"..\\")
    387          #-windows "../"
    388          #+windows "..\\")
     388         "../")
    389389  t)
    390390
     
    403403(deftest physical.31
    404404  (string= (namestring (make-pathname :directory '(:relative :up)))
    405            #+windows "..\\"
    406            #-windows "../")
     405           "../")
    407406  t)
    408407
     
    919918(deftest translate-pathname.12
    920919  (string= (namestring (translate-pathname "foo.bar" "*.*" "/usr/local/*.*"))
    921            #-windows "/usr/local/foo.bar"
    922            #+windows "\\usr\\local\\foo.bar")
     920           "/usr/local/foo.bar")
    923921  t)
    924922
     
    11191117  (equal (enough-namestring #p"foo/bar" #p"foo") "foo/bar")
    11201118  #+windows
    1121   (equal (enough-namestring #p"foo\\bar" #p"foo") "foo\\bar")
     1119  (equal (enough-namestring #p"foo\\bar" #p"foo") "foo/bar")
    11221120  t)
    11231121
     
    12521250  #-clisp
    12531251  (equal (namestring (translate-logical-pathname "demo0:x.y"))
    1254          #-windows "/tmp/x.y"
    1255          #+windows "\\tmp\\x.y")
     1252         ;;#-windows
     1253         "/tmp/x.y"
     1254         ;;#+windows "\\tmp\\x.y"
     1255         )
    12561256  t)
    12571257
     
    16271627(deftest sbcl.59
    16281628  (string= (with-standard-io-syntax (write-to-string #p"/foo"))
    1629            #-windows "#P\"/foo\""
    1630            #+(and windows (not lispworks)) "#P\"\\\\foo\""
    1631            #+(and windows lispworks) "#P\"/foo\"")
     1629           ;;#-windows "#P\"/foo\""
     1630           ;;#+(and windows (not lispworks)) "#P\"\\\\foo\""
     1631           ;;#+(and windows lispworks)
     1632           "#P\"/foo\"")
    16321633  t)
    16331634
     
    16351636(deftest sbcl.60
    16361637  (string= (with-standard-io-syntax (write-to-string #p"/foo" :readably nil))
    1637            #-windows "#P\"/foo\""
    1638            #+(and windows (not lispworks)) "#P\"\\\\foo\""
    1639            #+(and windows lispworks) "#P\"/foo\"")
     1638           ;;#-windows
     1639           "#P\"/foo\""
     1640           ;;#+(and windows (not lispworks)) "#P\"\\\\foo\""
     1641           ;;#+(and windows lispworks) "#P\"/foo\""
     1642           )
    16401643  t)
    16411644
     
    16431646(deftest sbcl.61
    16441647  (string= (with-standard-io-syntax (write-to-string #p"/foo" :escape nil))
    1645            #-windows "#P\"/foo\""
    1646            #+(and windows (not lispworks)) "#P\"\\\\foo\""
    1647            #+(and windows lispworks) "#P\"/foo\"")
     1648           ;;#-windows
     1649           "#P\"/foo\""
     1650           ;;#+(and windows (not lispworks)) "#P\"\\\\foo\""
     1651           ;;#+(and windows lispworks) "#P\"/foo\""
     1652           )
    16481653  t)
    16491654
    16501655(deftest sbcl.62
    16511656  (string= (with-standard-io-syntax (write-to-string #p"/foo" :readably nil :escape nil))
    1652            #-windows "/foo"
    1653            #+windows "\\foo")
    1654   t)
     1657           ;;#-windows
     1658           "/foo"
     1659           ;;#+windows "\\foo"
     1660           )
     1661  t)
Note: See TracChangeset for help on using the changeset viewer.