Commit dcaa3a30 authored by Mark Evenson's avatar Mark Evenson 💬
Browse files

Merge branch 'sandbox-run' into 'master'

Sandbox run

Run all tests in directory `sandbox/`

Additionally fix partial tests in `makefile`

fwiw it works OK for ECL

See merge request !2
parents e93ee420 c9ab8755
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
(when *load-pathname* (when *load-pathname*
(mapc #'regression-test:rem-test '(load-pathname.1 load-truename.1))) (mapc #'regression-test:rem-test '(load-pathname.1 load-truename.1)))
;; We could use uiop:chdir here, but what about new implementations?
(setf *default-pathname-defaults* (truename #P"sandbox/"))
(time (regression-test:do-tests)) (time (regression-test:do-tests))
#+allegro :exit #+allegro :exit
......
...@@ -70,6 +70,9 @@ ...@@ -70,6 +70,9 @@
(when *load-pathname* (when *load-pathname*
(mapc #'regression-test:rem-test '(load-pathname.1 load-truename.1))) (mapc #'regression-test:rem-test '(load-pathname.1 load-truename.1)))
;; We could use uiop:chdir here, but what about new implementations?
(setf *default-pathname-defaults* (truename #P"sandbox/"))
(time (regression-test:do-tests)) (time (regression-test:do-tests))
#+allegro (cl-user::exit) #+allegro (cl-user::exit)
......
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
(when *load-pathname* (when *load-pathname*
(mapc #'regression-test:rem-test '(load-pathname.1 load-truename.1))) (mapc #'regression-test:rem-test '(load-pathname.1 load-truename.1)))
;; We could use uiop:chdir here, but what about new implementations?
(setf *default-pathname-defaults* (truename #P"sandbox/"))
(time (regression-test:do-tests)) (time (regression-test:do-tests))
#+allegro (cl-user::exit) #+allegro (cl-user::exit)
......
...@@ -6,23 +6,23 @@ ...@@ -6,23 +6,23 @@
(deftest directory.1 (deftest directory.1
(directory "sample-files/nonexistent") (directory "nonexistent")
nil) nil)
(deftest directory.2 (deftest directory.2
(directory #p"sample-files/nonexistent") (directory #p"nonexistent")
nil) nil)
(deftest directory.3 (deftest directory.3
(directory "sample-files/nonexistent" :allow-other-keys nil) (directory "nonexistent" :allow-other-keys nil)
nil) nil)
(deftest directory.4 (deftest directory.4
(directory "sample-files/nonexistent" :allow-other-keys t :foo 'bar) (directory "nonexistent" :allow-other-keys t :foo 'bar)
nil) nil)
(deftest directory.5 (deftest directory.5
(directory "sample-files/nonexistent" :foo 0 :allow-other-keys t) (directory "nonexistent" :foo 0 :allow-other-keys t)
nil) nil)
(deftest directory.6 (deftest directory.6
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
(deftest directory.9 (deftest directory.9
(do-special-strings (do-special-strings
(s "sample-files/nonexistent" nil) (s "nonexistent" nil)
(assert (null (directory s)))) (assert (null (directory s))))
nil) nil)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
(deftest file-write-date.1 (deftest file-write-date.1
(let* ((pn "sample-files/file-write-date.txt") (let* ((pn "file-write-date.txt")
(date (file-write-date pn)) (date (file-write-date pn))
(time (get-universal-time))) (time (get-universal-time)))
(or (null date) (or (null date)
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
t) t)
(deftest file-write-date.2 (deftest file-write-date.2
(let* ((pn #p"sample-files/file-write-date.txt") (let* ((pn #p"file-write-date.txt")
(date (file-write-date pn)) (date (file-write-date pn))
(time (get-universal-time))) (time (get-universal-time)))
(or (null date) (or (null date)
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
t) t)
(deftest file-write-date.3 (deftest file-write-date.3
(let* ((pn (truename "sample-files/file-write-date.txt")) (let* ((pn (truename "file-write-date.txt"))
(date (file-write-date pn)) (date (file-write-date pn))
(time (get-universal-time))) (time (get-universal-time)))
(or (null date) (or (null date)
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
nil) nil)
(deftest file-write-date.5 (deftest file-write-date.5
(length (multiple-value-list (file-write-date "sample-files/file-write-date.txt"))) (length (multiple-value-list (file-write-date "file-write-date.txt")))
1) 1)
;;; Specialized string tests ;;; Specialized string tests
(deftest file-write-date.6 (deftest file-write-date.6
(let* ((str "sample-files/file-write-date.txt") (let* ((str "file-write-date.txt")
(date (file-write-date str))) (date (file-write-date str)))
(do-special-strings (do-special-strings
(s str nil) (s str nil)
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
t) t)
(deftest file-write-date.error.2 (deftest file-write-date.error.2
(signals-error (file-write-date "sample-files/file-write-date.txt" nil) (signals-error (file-write-date "file-write-date.txt" nil)
program-error) program-error)
t) t)
......
...@@ -11,80 +11,80 @@ LISP=ecl ...@@ -11,80 +11,80 @@ LISP=ecl
MAKE=make MAKE=make
test: test:
@rm -rf scratch @rm -rf sandbox/scratch
cat doit.lsp | $(LISP) | tee test.out cat doit.lsp | $(LISP) | tee test.out
test-symbols: test-symbols:
(cat doit1.lsp ; echo "(load \"load-symbols.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-symbols.out (cat doit1.lsp ; echo "(load \"symbols/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-symbols.out
test-eval-and-compile: test-eval-and-compile:
(cat doit1.lsp ; echo "(load \"load-eval-and-compile.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-eval-and-compile.out (cat doit1.lsp ; echo "(load \"eval-and-compile/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-eval-and-compile.out
test-data-and-control-flow: test-data-and-control-flow:
(cat doit1.lsp ; echo "(load \"load-data-and-control-flow.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-data-and-control-flow.out (cat doit1.lsp ; echo "(load \"data-and-control-flow/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-data-and-control-flow.out
test-iteration: test-iteration:
(cat doit1.lsp ; echo "(load \"load-iteration.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-iteration.out (cat doit1.lsp ; echo "(load \"iteration/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-iteration.out
test-objects: test-objects:
(cat doit1.lsp ; echo "(load \"load-objects.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-objects.out (cat doit1.lsp ; echo "(load \"objects/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-objects.out
test-conditions: test-conditions:
(cat doit1.lsp ; echo "(load \"load-conditions.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-conditions.out (cat doit1.lsp ; echo "(load \"conditions/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-conditions.out
test-cons: test-cons:
(cat doit1.lsp ; echo "(load \"load-cons.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-cons.out (cat doit1.lsp ; echo "(load \"cons/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-cons.out
test-arrays: test-arrays:
(cat doit1.lsp ; echo "(load \"load-arrays.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-arrays.out (cat doit1.lsp ; echo "(load \"arrays/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-arrays.out
test-hash-tables: test-hash-tables:
(cat doit1.lsp ; echo "(load \"load-hash-tables.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-hash-tables.out (cat doit1.lsp ; echo "(load \"hash-tables/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-hash-tables.out
test-packages: test-packages:
(cat doit1.lsp ; echo "(load \"load-packages.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-packages.out (cat doit1.lsp ; echo "(load \"packages/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-packages.out
test-numbers: test-numbers:
(cat doit1.lsp ; echo "(load \"load-numbers.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-numbers.out (cat doit1.lsp ; echo "(load \"numbers/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-numbers.out
test-sequences: test-sequences:
(cat doit1.lsp ; echo "(load \"load-sequences.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-sequences.out (cat doit1.lsp ; echo "(load \"sequences/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-sequences.out
test-structures: test-structures:
(cat doit1.lsp ; echo "(load \"load-structures.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-structures.out (cat doit1.lsp ; echo "(load \"structures/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-structures.out
test-types-and-class: test-types-and-class:
(cat doit1.lsp ; echo "(load \"load-types-and-class.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-types-and-class.out (cat doit1.lsp ; echo "(load \"types-and-class/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-types-and-class.out
test-strings: test-strings:
(cat doit1.lsp ; echo "(load \"load-strings.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-strings.out (cat doit1.lsp ; echo "(load \"strings/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-strings.out
test-characters: test-characters:
(cat doit1.lsp ; echo "(load \"load-characters.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-characters.out (cat doit1.lsp ; echo "(load \"characters/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-characters.out
test-pathnames: test-pathnames:
(cat doit1.lsp ; echo "(load \"load-pathnames.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-pathnames.out (cat doit1.lsp ; echo "(load \"pathnames/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-pathnames.out
test-files: test-files:
(cat doit1.lsp ; echo "(load \"load-files.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-files.out (cat doit1.lsp ; echo "(load \"files/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-files.out
test-streams: test-streams:
(cat doit1.lsp ; echo "(load \"load-streams.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-streams.out (cat doit1.lsp ; echo "(load \"streams/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-streams.out
test-printer: test-printer:
(cat doit1.lsp ; echo "(load \"load-printer.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-printer.out (cat doit1.lsp ; echo "(load \"printer/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-printer.out
test-reader: test-reader:
(cat doit1.lsp ; echo "(load \"load-reader.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-reader.out (cat doit1.lsp ; echo "(load \"reader/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-reader.out
test-system-construction: test-system-construction:
(cat doit1.lsp ; echo "(load \"load-system-construction.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-system-construction.out (cat doit1.lsp ; echo "(load \"system-construction/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-system-construction.out
test-environment: test-environment:
(cat doit1.lsp ; echo "(load \"load-environment.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-environment.out (cat doit1.lsp ; echo "(load \"environment/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-environment.out
test-misc: test-misc:
(cat doit1.lsp ; echo "(load \"load-misc.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-misc.out (cat doit1.lsp ; echo "(load \"misc/load.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-misc.out
test-all: test-symbols test-eval-and-compile test-data-and-control-flow test-iteration test-objects \ test-all: test-symbols test-eval-and-compile test-data-and-control-flow test-iteration test-objects \
test-conditions test-cons test-arrays test-hash-tables test-packages test-numbers \ test-conditions test-cons test-arrays test-hash-tables test-packages test-numbers \
...@@ -137,11 +137,11 @@ rt_1000_8: ...@@ -137,11 +137,11 @@ rt_1000_8:
clean: clean:
@rm -f auxiliary/*.{out,fas,cls,fasl,o,so,~,fn,x86f,ufsl,abcl,lib} @rm -f auxiliary/*.{out,fas,cls,fasl,o,so,~,fn,x86f,ufsl,abcl,lib}
@rm -f sample-files/*.{out,fas,cls,fasl,o,so,~,fn,x86f,ufsl,abcl,lib} @rm -f sandbox/*.{out,fas,cls,fasl,o,so,~,fn,x86f,ufsl,abcl,lib}
@rm -f test*.out *.cls *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl *.abcl *.fas *.lib \#*\# @rm -f test*.out *.cls *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl *.abcl *.fas *.lib \#*\#
@rm -f *.dfsl *.d64fsl @rm -f *.dfsl *.d64fsl
@(cd beyond-ansi; $(MAKE) clean) @(cd beyond-ansi; $(MAKE) clean)
@rm -rf scratch/ scratch.txt @rm -rf sandbox/scratch/ sandbox/scratch.txt
@rm -f foo.txt foo.lsp foo.dat @rm -f foo.txt foo.lsp foo.dat
@rm -f tmp.txt tmp.dat tmp2.dat temp.dat @rm -f tmp.txt tmp.dat tmp2.dat temp.dat
@rm -f gazonk* out.class @rm -f gazonk* out.class
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
(deftest directory-namestring.1 (deftest directory-namestring.1
(let* ((vals (multiple-value-list (let* ((vals (multiple-value-list
(directory-namestring "sample-files/directory-namestring.txt"))) (directory-namestring "directory-namestring.txt")))
(s (first vals))) (s (first vals)))
(if (and (null (cdr vals)) (if (and (null (cdr vals))
(stringp s) (stringp s)
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
(deftest directory-namestring.2 (deftest directory-namestring.2
(do-special-strings (do-special-strings
(s "sample-files/directory-namestring.txt" nil) (s "directory-namestring.txt" nil)
(let ((ns (directory-namestring s))) (let ((ns (directory-namestring s)))
(assert (stringp ns)) (assert (stringp ns))
(assert (string= (directory-namestring ns) ns)))) (assert (string= (directory-namestring ns) ns))))
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
;;; in which so much is left up to the implementation.) ;;; in which so much is left up to the implementation.)
#-lispworks #-lispworks
(deftest directory-namestring.3 (deftest directory-namestring.3
(let* ((name "sample-files/directory-namestring.txt") (let* ((name "directory-namestring.txt")
(pn (merge-pathnames (pathname name))) (pn (merge-pathnames (pathname name)))
(name2 (with-open-file (s pn :direction :input) (name2 (with-open-file (s pn :direction :input)
(directory-namestring s))) (directory-namestring s)))
...@@ -47,6 +47,6 @@ ...@@ -47,6 +47,6 @@
(deftest directory-namestring.error.2 (deftest directory-namestring.error.2
(signals-error (signals-error
(directory-namestring "sample-files/directory-namestring.txt" nil) (directory-namestring "directory-namestring.txt" nil)
program-error) program-error)
t) t)
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
(deftest enough-namestring.1 (deftest enough-namestring.1
(let* ((vals (multiple-value-list (let* ((vals (multiple-value-list
(enough-namestring "sample-files/enough-namestring.txt"))) (enough-namestring "enough-namestring.txt")))
(s (first vals))) (s (first vals)))
(if (and (null (cdr vals)) (if (and (null (cdr vals))
(stringp s) (stringp s)
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
(deftest enough-namestring.2 (deftest enough-namestring.2
(do-special-strings (do-special-strings
(s "sample-files/enough-namestring.txt" nil) (s "enough-namestring.txt" nil)
(let ((ns (enough-namestring s))) (let ((ns (enough-namestring s)))
(assert (stringp ns)) (assert (stringp ns))
(assert (string= (enough-namestring ns) ns)))) (assert (string= (enough-namestring ns) ns))))
nil) nil)
(deftest enough-namestring.3 (deftest enough-namestring.3
(let* ((name "sample-files/enough-namestring.txt") (let* ((name "enough-namestring.txt")
(pn (merge-pathnames (pathname name))) (pn (merge-pathnames (pathname name)))
(name2 (enough-namestring pn)) (name2 (enough-namestring pn))
(name3 (enough-namestring name))) (name3 (enough-namestring name)))
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
t) t)
(deftest enough-namestring.4 (deftest enough-namestring.4
(let* ((name "sample-files/enough-namestring.txt") (let* ((name "enough-namestring.txt")
(pn (merge-pathnames (pathname name))) (pn (merge-pathnames (pathname name)))
(name2 (with-open-file (s pn :direction :input) (enough-namestring s))) (name2 (with-open-file (s pn :direction :input) (enough-namestring s)))
(name3 (enough-namestring name))) (name3 (enough-namestring name)))
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
(deftest enough-namestring.5 (deftest enough-namestring.5
(let* ((vals (multiple-value-list (let* ((vals (multiple-value-list
(enough-namestring "sample-files/enough-namestring.txt" (enough-namestring "enough-namestring.txt"
*default-pathname-defaults*))) *default-pathname-defaults*)))
(s (first vals))) (s (first vals)))
(if (and (null (cdr vals)) (if (and (null (cdr vals))
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
(deftest enough-namestring.6 (deftest enough-namestring.6
(let* ((vals (multiple-value-list (let* ((vals (multiple-value-list
(enough-namestring "sample-files/enough-namestring.txt" (enough-namestring "enough-namestring.txt"
(namestring *default-pathname-defaults*)))) (namestring *default-pathname-defaults*))))
(s (first vals))) (s (first vals)))
(if (and (null (cdr vals)) (if (and (null (cdr vals))
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
(do-special-strings (do-special-strings
(s (namestring *default-pathname-defaults*) nil) (s (namestring *default-pathname-defaults*) nil)
(let* ((vals (multiple-value-list (let* ((vals (multiple-value-list
(enough-namestring "sample-files/enough-namestring.txt" s))) (enough-namestring "enough-namestring.txt" s)))
(s2 (first vals))) (s2 (first vals)))
(assert (null (cdr vals))) (assert (null (cdr vals)))
(assert (stringp s2)) (assert (stringp s2))
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
(deftest enough-namestring.error.2 (deftest enough-namestring.error.2
(signals-error (signals-error
(enough-namestring "sample-files/enough-namestring.txt" (enough-namestring "enough-namestring.txt"
*default-pathname-defaults* nil) *default-pathname-defaults* nil)
program-error) program-error)
t) t)
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
(deftest file-namestring.1 (deftest file-namestring.1
(let* ((vals (multiple-value-list (let* ((vals (multiple-value-list
(file-namestring "sample-files/file-namestring.txt"))) (file-namestring "file-namestring.txt")))
(s (first vals))) (s (first vals)))
(if (and (null (cdr vals)) (if (and (null (cdr vals))
(stringp s) (stringp s)
...@@ -16,14 +16,14 @@ ...@@ -16,14 +16,14 @@
(deftest file-namestring.2 (deftest file-namestring.2
(do-special-strings (do-special-strings
(s "sample-files/file-namestring.txt" nil) (s "file-namestring.txt" nil)
(let ((ns (file-namestring s))) (let ((ns (file-namestring s)))
(assert (stringp ns)) (assert (stringp ns))
(assert (string= (file-namestring ns) ns)))) (assert (string= (file-namestring ns) ns))))
nil) nil)
(deftest file-namestring.3 (deftest file-namestring.3
(let* ((name "sample-files/file-namestring.txt") (let* ((name "file-namestring.txt")
(pn (merge-pathnames (pathname name))) (pn (merge-pathnames (pathname name)))
(name2 (with-open-file (s pn :direction :input) (name2 (with-open-file (s pn :direction :input)
(file-namestring s))) (file-namestring s)))
...@@ -38,6 +38,6 @@ ...@@ -38,6 +38,6 @@
t) t)
(deftest file-namestring.error.2 (deftest file-namestring.error.2
(signals-error (file-namestring "sample-files/file-namestring.txt" nil) (signals-error (file-namestring "file-namestring.txt" nil)
program-error) program-error)
t) t)
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
(deftest host-namestring.1 (deftest host-namestring.1
(let* ((vals (multiple-value-list (let* ((vals (multiple-value-list
(host-namestring "sample-files/host-namestring.txt"))) (host-namestring "host-namestring.txt")))
(s (first vals))) (s (first vals)))
(if (and (null (cdr vals)) (if (and (null (cdr vals))
(or (null s) (or (null s)
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
(deftest host-namestring.2 (deftest host-namestring.2
(do-special-strings (do-special-strings
(s "sample-files/host-namestring.txt" nil) (s "host-namestring.txt" nil)
(let ((ns (host-namestring s))) (let ((ns (host-namestring s)))
(when ns (when ns
(assert (stringp ns)) (assert (stringp ns))
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
nil) nil)
(deftest host-namestring.3 (deftest host-namestring.3
(let* ((name "sample-files/host-namestring.txt") (let* ((name "host-namestring.txt")
(pn (merge-pathnames (pathname name))) (pn (merge-pathnames (pathname name)))
(name2 (with-open-file (s pn :direction :input) (name2 (with-open-file (s pn :direction :input)
(host-namestring s))) (host-namestring s)))
...@@ -44,6 +44,6 @@ ...@@ -44,6 +44,6 @@
t) t)
(deftest host-namestring.error.2 (deftest host-namestring.error.2
(signals-error (host-namestring "sample-files/host-namestring.txt" nil) (signals-error (host-namestring "host-namestring.txt" nil)
program-error) program-error)
t) t)
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
(deftest logical-pathname.error.3 (deftest logical-pathname.error.3
(signals-error (signals-error
(with-open-file (s #p"sample-files/logical-pathname.txt" :direction :input) (with-open-file (s #p"logical-pathname.txt" :direction :input)
(logical-pathname s)) (logical-pathname s))
type-error) type-error)
t) t)
......
...@@ -10,21 +10,21 @@ ...@@ -10,21 +10,21 @@
t) t)
(deftest pathname.2 (deftest pathname.2
(equalt #p"sample-files/pathname.txt" (pathname "sample-files/pathname.txt")) (equalt #p"pathname.txt" (pathname "pathname.txt"))
t) t)
(deftest pathname.3 (deftest pathname.3
(let ((s (open "sample-files/pathname.txt" :direction :input))) (let ((s (open "pathname.txt" :direction :input)))
(prog1 (equalt (truename (pathname s)) (prog1 (equalt (truename (pathname s))
(truename #p"sample-files/pathname.txt")) (truename #p"pathname.txt"))
(close s))) (close s)))
t) t)