diff --git a/doit.lsp b/doit.lsp index 419babbe01f30754842d148c69f466b7dced316d..0b00d237ceb79bc54ff24ce4b9ed07a270a657b8 100644 --- a/doit.lsp +++ b/doit.lsp @@ -70,7 +70,8 @@ (when *load-pathname* (mapc #'regression-test:rem-test '(load-pathname.1 load-truename.1))) -(time (regression-test:do-tests)) +(ext:chdir #P"sandbox/") +(time (regression-test:do-tests))) #+allegro (cl-user::exit) #+(or cmu sbcl gcl armedbear clisp) (cl-user::quit) diff --git a/files/directory.lsp b/files/directory.lsp index ea5c2babc5490635d82b659500aab250838ecc4e..897657060ae673062ec9907fab171288437abc5e 100644 --- a/files/directory.lsp +++ b/files/directory.lsp @@ -6,23 +6,23 @@ (deftest directory.1 - (directory "sample-files/nonexistent") + (directory "nonexistent") nil) (deftest directory.2 - (directory #p"sample-files/nonexistent") + (directory #p"nonexistent") nil) (deftest directory.3 - (directory "sample-files/nonexistent" :allow-other-keys nil) + (directory "nonexistent" :allow-other-keys nil) nil) (deftest directory.4 - (directory "sample-files/nonexistent" :allow-other-keys t :foo 'bar) + (directory "nonexistent" :allow-other-keys t :foo 'bar) nil) (deftest directory.5 - (directory "sample-files/nonexistent" :foo 0 :allow-other-keys t) + (directory "nonexistent" :foo 0 :allow-other-keys t) nil) (deftest directory.6 @@ -62,7 +62,7 @@ (deftest directory.9 (do-special-strings - (s "sample-files/nonexistent" nil) + (s "nonexistent" nil) (assert (null (directory s)))) nil) diff --git a/files/file-write-date.lsp b/files/file-write-date.lsp index aaa044fe58f3e86a598e7bdf1ab5801a20cfad62..060a12fe7632cfea62427d0ebc2fb7960204158b 100644 --- a/files/file-write-date.lsp +++ b/files/file-write-date.lsp @@ -6,7 +6,7 @@ (deftest file-write-date.1 - (let* ((pn "sample-files/file-write-date.txt") + (let* ((pn "file-write-date.txt") (date (file-write-date pn)) (time (get-universal-time))) (or (null date) @@ -16,7 +16,7 @@ t) (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)) (time (get-universal-time))) (or (null date) @@ -26,7 +26,7 @@ t) (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)) (time (get-universal-time))) (or (null date) @@ -47,13 +47,13 @@ nil) (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) ;;; Specialized string tests (deftest file-write-date.6 - (let* ((str "sample-files/file-write-date.txt") + (let* ((str "file-write-date.txt") (date (file-write-date str))) (do-special-strings (s str nil) @@ -70,7 +70,7 @@ t) (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) t) diff --git a/makefile b/makefile index f463cc2bf07187cd43d7d9e659089c0261388336..f74d27d8a4ab0f9ad604729bd214851427961a5c 100644 --- a/makefile +++ b/makefile @@ -12,7 +12,7 @@ MAKE=make test: @rm -rf scratch - cat doit.lsp | $(LISP) | tee test.out + cd sandbox | cat doit.lsp | $(LISP) | tee test.out test-symbols: (cat doit1.lsp ; echo "(load \"load-symbols.lsp\")"; cat doit2.lsp) | $(LISP) | tee test-symbols.out diff --git a/pathnames/directory-namestring.lsp b/pathnames/directory-namestring.lsp index cb61d56712a243d09e070b3aaf5b3d8cbcd51880..f74462223a82cc850944f25912b677d52c3521f0 100644 --- a/pathnames/directory-namestring.lsp +++ b/pathnames/directory-namestring.lsp @@ -7,7 +7,7 @@ (deftest directory-namestring.1 (let* ((vals (multiple-value-list - (directory-namestring "sample-files/directory-namestring.txt"))) + (directory-namestring "directory-namestring.txt"))) (s (first vals))) (if (and (null (cdr vals)) (stringp s) @@ -18,7 +18,7 @@ (deftest directory-namestring.2 (do-special-strings - (s "sample-files/directory-namestring.txt" nil) + (s "directory-namestring.txt" nil) (let ((ns (directory-namestring s))) (assert (stringp ns)) (assert (string= (directory-namestring ns) ns)))) @@ -31,7 +31,7 @@ ;;; in which so much is left up to the implementation.) #-lispworks (deftest directory-namestring.3 - (let* ((name "sample-files/directory-namestring.txt") + (let* ((name "directory-namestring.txt") (pn (merge-pathnames (pathname name))) (name2 (with-open-file (s pn :direction :input) (directory-namestring s))) @@ -47,6 +47,6 @@ (deftest directory-namestring.error.2 (signals-error - (directory-namestring "sample-files/directory-namestring.txt" nil) + (directory-namestring "directory-namestring.txt" nil) program-error) t) diff --git a/pathnames/enough-namestring.lsp b/pathnames/enough-namestring.lsp index 3706cdf7fc0011e7ab5617b677c31f2c4db7abda..3cdbd0784587dbbfc7593eaf4f6a30aa46bc1e6a 100644 --- a/pathnames/enough-namestring.lsp +++ b/pathnames/enough-namestring.lsp @@ -7,7 +7,7 @@ (deftest enough-namestring.1 (let* ((vals (multiple-value-list - (enough-namestring "sample-files/enough-namestring.txt"))) + (enough-namestring "enough-namestring.txt"))) (s (first vals))) (if (and (null (cdr vals)) (stringp s) @@ -18,14 +18,14 @@ (deftest enough-namestring.2 (do-special-strings - (s "sample-files/enough-namestring.txt" nil) + (s "enough-namestring.txt" nil) (let ((ns (enough-namestring s))) (assert (stringp ns)) (assert (string= (enough-namestring ns) ns)))) nil) (deftest enough-namestring.3 - (let* ((name "sample-files/enough-namestring.txt") + (let* ((name "enough-namestring.txt") (pn (merge-pathnames (pathname name))) (name2 (enough-namestring pn)) (name3 (enough-namestring name))) @@ -33,7 +33,7 @@ t) (deftest enough-namestring.4 - (let* ((name "sample-files/enough-namestring.txt") + (let* ((name "enough-namestring.txt") (pn (merge-pathnames (pathname name))) (name2 (with-open-file (s pn :direction :input) (enough-namestring s))) (name3 (enough-namestring name))) @@ -42,7 +42,7 @@ (deftest enough-namestring.5 (let* ((vals (multiple-value-list - (enough-namestring "sample-files/enough-namestring.txt" + (enough-namestring "enough-namestring.txt" *default-pathname-defaults*))) (s (first vals))) (if (and (null (cdr vals)) @@ -54,7 +54,7 @@ (deftest enough-namestring.6 (let* ((vals (multiple-value-list - (enough-namestring "sample-files/enough-namestring.txt" + (enough-namestring "enough-namestring.txt" (namestring *default-pathname-defaults*)))) (s (first vals))) (if (and (null (cdr vals)) @@ -68,7 +68,7 @@ (do-special-strings (s (namestring *default-pathname-defaults*) nil) (let* ((vals (multiple-value-list - (enough-namestring "sample-files/enough-namestring.txt" s))) + (enough-namestring "enough-namestring.txt" s))) (s2 (first vals))) (assert (null (cdr vals))) (assert (stringp s2)) @@ -83,7 +83,7 @@ (deftest enough-namestring.error.2 (signals-error - (enough-namestring "sample-files/enough-namestring.txt" + (enough-namestring "enough-namestring.txt" *default-pathname-defaults* nil) program-error) t) diff --git a/pathnames/file-namestring.lsp b/pathnames/file-namestring.lsp index 9d543ac072ef4d2cda5932fb4a630865749dd2ef..aa5eabd0b2c1543cafd26507d744c815e7be50b0 100644 --- a/pathnames/file-namestring.lsp +++ b/pathnames/file-namestring.lsp @@ -5,7 +5,7 @@ (deftest file-namestring.1 (let* ((vals (multiple-value-list - (file-namestring "sample-files/file-namestring.txt"))) + (file-namestring "file-namestring.txt"))) (s (first vals))) (if (and (null (cdr vals)) (stringp s) @@ -16,14 +16,14 @@ (deftest file-namestring.2 (do-special-strings - (s "sample-files/file-namestring.txt" nil) + (s "file-namestring.txt" nil) (let ((ns (file-namestring s))) (assert (stringp ns)) (assert (string= (file-namestring ns) ns)))) nil) (deftest file-namestring.3 - (let* ((name "sample-files/file-namestring.txt") + (let* ((name "file-namestring.txt") (pn (merge-pathnames (pathname name))) (name2 (with-open-file (s pn :direction :input) (file-namestring s))) @@ -38,6 +38,6 @@ t) (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) t) diff --git a/pathnames/host-namestring.lsp b/pathnames/host-namestring.lsp index 8b11e40ebaac47747603258bf482577ea6870302..2218ba06d124fdf1f17f9bab6d8b04ef87cd8f37 100644 --- a/pathnames/host-namestring.lsp +++ b/pathnames/host-namestring.lsp @@ -7,7 +7,7 @@ (deftest host-namestring.1 (let* ((vals (multiple-value-list - (host-namestring "sample-files/host-namestring.txt"))) + (host-namestring "host-namestring.txt"))) (s (first vals))) (if (and (null (cdr vals)) (or (null s) @@ -20,7 +20,7 @@ (deftest host-namestring.2 (do-special-strings - (s "sample-files/host-namestring.txt" nil) + (s "host-namestring.txt" nil) (let ((ns (host-namestring s))) (when ns (assert (stringp ns)) @@ -29,7 +29,7 @@ nil) (deftest host-namestring.3 - (let* ((name "sample-files/host-namestring.txt") + (let* ((name "host-namestring.txt") (pn (merge-pathnames (pathname name))) (name2 (with-open-file (s pn :direction :input) (host-namestring s))) @@ -44,6 +44,6 @@ t) (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) t) diff --git a/pathnames/logical-pathname.lsp b/pathnames/logical-pathname.lsp index 1fb08c72b4432b69c596b8a37e81344400e380fb..d3204986bc981584149c4df015c5199ab375eec8 100644 --- a/pathnames/logical-pathname.lsp +++ b/pathnames/logical-pathname.lsp @@ -38,7 +38,7 @@ (deftest logical-pathname.error.3 (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)) type-error) t) diff --git a/pathnames/pathname.lsp b/pathnames/pathname.lsp index 38bc306facda6162ef0a2888ebdd3389d65de530..b32b9c7917dd6f8da784307021bbfa19f6eeef3e 100644 --- a/pathnames/pathname.lsp +++ b/pathnames/pathname.lsp @@ -10,21 +10,21 @@ t) (deftest pathname.2 - (equalt #p"sample-files/pathname.txt" (pathname "sample-files/pathname.txt")) + (equalt #p"pathname.txt" (pathname "pathname.txt")) t) (deftest pathname.3 - (let ((s (open "sample-files/pathname.txt" :direction :input))) + (let ((s (open "pathname.txt" :direction :input))) (prog1 (equalt (truename (pathname s)) - (truename #p"sample-files/pathname.txt")) + (truename #p"pathname.txt")) (close s))) t) (deftest pathname.4 - (let ((s (open "sample-files/pathname.txt" :direction :input))) + (let ((s (open "pathname.txt" :direction :input))) (close s) (equalt (truename (pathname s)) - (truename #p"sample-files/pathname.txt"))) + (truename #p"pathname.txt"))) t) (deftest pathname.5 @@ -33,41 +33,41 @@ t) (deftest pathname.6 - (equalt #p"sample-files/pathname.txt" + (equalt #p"pathname.txt" (pathname (make-array 25 - :initial-contents "sample-files/pathname.txt" + :initial-contents "pathname.txt" :element-type 'base-char))) t) (deftest pathname.7 - (equalt #p"sample-files/pathname.txt" + (equalt #p"pathname.txt" (pathname (make-array 28 - :initial-contents "sample-files/pathname.txtXXX" + :initial-contents "pathname.txtXXX" :element-type 'base-char :fill-pointer 25))) t) (deftest pathname.8 - (equalt #p"sample-files/pathname.txt" + (equalt #p"pathname.txt" (pathname (make-array 25 - :initial-contents "sample-files/pathname.txt" + :initial-contents "pathname.txt" :element-type 'base-char :adjustable t))) t) (deftest pathname.9 - (equalt #p"sample-files/pathname.txt" + (equalt #p"pathname.txt" (pathname (make-array 28 - :initial-contents "sample-files/pathname.txtXXX" + :initial-contents "pathname.txtXXX" :element-type 'character :fill-pointer 25))) t) (deftest pathname.10 - (equalt #p"sample-files/pathname.txt" + (equalt #p"pathname.txt" (pathname (make-array 25 - :initial-contents "sample-files/pathname.txt" + :initial-contents "pathname.txt" :element-type 'character :adjustable t))) t) @@ -75,11 +75,11 @@ (deftest pathname.11 (loop for etype in '(standard-char base-char character) collect - (equalt #p"sample-files/pathname.txt" + (equalt #p"pathname.txt" (pathname (let* ((s (make-array 28 :initial-contents - "XXsample-files/pathname.txtX" + "XXpathname.txtX" :element-type etype))) (make-array 25 :element-type etype diff --git a/sample-files/class-precedence-lists.txt b/sandbox/class-precedence-lists.txt similarity index 100% rename from sample-files/class-precedence-lists.txt rename to sandbox/class-precedence-lists.txt diff --git a/sample-files/compile-file-test-file-2.lsp b/sandbox/compile-file-test-file-2.lsp similarity index 100% rename from sample-files/compile-file-test-file-2.lsp rename to sandbox/compile-file-test-file-2.lsp diff --git a/sample-files/compile-file-test-file-2a.lsp b/sandbox/compile-file-test-file-2a.lsp similarity index 100% rename from sample-files/compile-file-test-file-2a.lsp rename to sandbox/compile-file-test-file-2a.lsp diff --git a/sample-files/compile-file-test-file-3.lsp b/sandbox/compile-file-test-file-3.lsp similarity index 100% rename from sample-files/compile-file-test-file-3.lsp rename to sandbox/compile-file-test-file-3.lsp diff --git a/sample-files/compile-file-test-file-4.lsp b/sandbox/compile-file-test-file-4.lsp similarity index 100% rename from sample-files/compile-file-test-file-4.lsp rename to sandbox/compile-file-test-file-4.lsp diff --git a/sample-files/compile-file-test-file-5.lsp b/sandbox/compile-file-test-file-5.lsp similarity index 100% rename from sample-files/compile-file-test-file-5.lsp rename to sandbox/compile-file-test-file-5.lsp diff --git a/sample-files/compile-file-test-file.lsp b/sandbox/compile-file-test-file.lsp similarity index 100% rename from sample-files/compile-file-test-file.lsp rename to sandbox/compile-file-test-file.lsp diff --git a/sample-files/directory-namestring.txt b/sandbox/directory-namestring.txt similarity index 100% rename from sample-files/directory-namestring.txt rename to sandbox/directory-namestring.txt diff --git a/sample-files/enough-namestring.txt b/sandbox/enough-namestring.txt similarity index 100% rename from sample-files/enough-namestring.txt rename to sandbox/enough-namestring.txt diff --git a/ensure-directories-exist.txt b/sandbox/ensure-directories-exist.txt similarity index 100% rename from ensure-directories-exist.txt rename to sandbox/ensure-directories-exist.txt diff --git a/file-author.txt b/sandbox/file-author.txt similarity index 100% rename from file-author.txt rename to sandbox/file-author.txt diff --git a/file-error.txt b/sandbox/file-error.txt similarity index 100% rename from file-error.txt rename to sandbox/file-error.txt diff --git a/sample-files/file-length.txt b/sandbox/file-length.txt similarity index 100% rename from sample-files/file-length.txt rename to sandbox/file-length.txt diff --git a/sample-files/file-namestring.txt b/sandbox/file-namestring.txt similarity index 100% rename from sample-files/file-namestring.txt rename to sandbox/file-namestring.txt diff --git a/sample-files/file-position.txt b/sandbox/file-position.txt similarity index 100% rename from sample-files/file-position.txt rename to sandbox/file-position.txt diff --git a/sample-files/file-write-date.txt b/sandbox/file-write-date.txt similarity index 100% rename from sample-files/file-write-date.txt rename to sandbox/file-write-date.txt diff --git a/sample-files/host-namestring.txt b/sandbox/host-namestring.txt similarity index 100% rename from sample-files/host-namestring.txt rename to sandbox/host-namestring.txt diff --git a/sample-files/input-stream-p.txt b/sandbox/input-stream-p.txt similarity index 100% rename from sample-files/input-stream-p.txt rename to sandbox/input-stream-p.txt diff --git a/sample-files/listen.txt b/sandbox/listen.txt similarity index 100% rename from sample-files/listen.txt rename to sandbox/listen.txt diff --git a/sample-files/load-test-file-2.lsp b/sandbox/load-test-file-2.lsp similarity index 100% rename from sample-files/load-test-file-2.lsp rename to sandbox/load-test-file-2.lsp diff --git a/sample-files/load-test-file.lsp b/sandbox/load-test-file.lsp similarity index 100% rename from sample-files/load-test-file.lsp rename to sandbox/load-test-file.lsp diff --git a/sample-files/logical-pathname.txt b/sandbox/logical-pathname.txt similarity index 100% rename from sample-files/logical-pathname.txt rename to sandbox/logical-pathname.txt diff --git a/sample-files/modules7.lsp b/sandbox/modules7.lsp similarity index 100% rename from sample-files/modules7.lsp rename to sandbox/modules7.lsp diff --git a/sample-files/modules8a.lsp b/sandbox/modules8a.lsp similarity index 100% rename from sample-files/modules8a.lsp rename to sandbox/modules8a.lsp diff --git a/sample-files/modules8b.lsp b/sandbox/modules8b.lsp similarity index 100% rename from sample-files/modules8b.lsp rename to sandbox/modules8b.lsp diff --git a/sample-files/open-stream-p.txt b/sandbox/open-stream-p.txt similarity index 100% rename from sample-files/open-stream-p.txt rename to sandbox/open-stream-p.txt diff --git a/sample-files/output-stream-p.txt b/sandbox/output-stream-p.txt similarity index 100% rename from sample-files/output-stream-p.txt rename to sandbox/output-stream-p.txt diff --git a/sample-files/pathname.txt b/sandbox/pathname.txt similarity index 100% rename from sample-files/pathname.txt rename to sandbox/pathname.txt diff --git a/probe-file.txt b/sandbox/probe-file.txt similarity index 100% rename from probe-file.txt rename to sandbox/probe-file.txt diff --git a/truename.txt b/sandbox/truename.txt similarity index 100% rename from truename.txt rename to sandbox/truename.txt diff --git a/streams/file-length.lsp b/streams/file-length.lsp index eccc5649e9b1bc67e34b72c6db3bae4dfe2cab92..17e32a8b86b4e626728e36a5d7d019e83a5b1ce3 100644 --- a/streams/file-length.lsp +++ b/streams/file-length.lsp @@ -11,7 +11,7 @@ (deftest file-length.error.2 (signals-error - (with-open-file (is "sample-files/file-length.txt" :direction :input) + (with-open-file (is "file-length.txt" :direction :input) (file-length is nil)) program-error) t) @@ -37,7 +37,7 @@ (deftest file-length.error.5 (signals-error (with-open-file - (is "sample-files/file-length.txt" :direction :input) + (is "file-length.txt" :direction :input) (with-open-file (os "tmp.txt" :direction :output :if-exists :supersede) (let ((s (make-two-way-stream is os))) @@ -48,7 +48,7 @@ (deftest file-length.error.6 (signals-error (with-open-file - (is "sample-files/file-length.txt" :direction :input) + (is "file-length.txt" :direction :input) (with-open-file (os "tmp.txt" :direction :output :if-exists :supersede) (let ((s (make-echo-stream is os))) @@ -71,7 +71,7 @@ (deftest file-length.error.10 (signals-error (with-open-file - (is "sample-files/file-length.txt" :direction :input) + (is "file-length.txt" :direction :input) (let ((s (make-concatenated-stream is))) (unwind-protect (file-length s) (close s)))) type-error) @@ -94,7 +94,7 @@ (deftest file-length.1 (let ((results (multiple-value-list (with-open-file - (is "sample-files/file-length.txt" :direction :input) + (is "file-length.txt" :direction :input) (file-length is))))) (and (= (length results) 1) (typep (car results) '(integer 1)) @@ -167,7 +167,7 @@ (deftest file-length.6 (with-open-file - (*foo* "sample-files/file-length.txt" :direction :input) + (*foo* "file-length.txt" :direction :input) (declare (special *foo*)) (let ((s (make-synonym-stream '*foo*))) (unwind-protect diff --git a/streams/file-position.lsp b/streams/file-position.lsp index 0b57fb54027a8239c387d292278c67a05bf3e728..6f26334e8c8d4a61ec1e769afb2f2ce3945f5617 100644 --- a/streams/file-position.lsp +++ b/streams/file-position.lsp @@ -6,12 +6,12 @@ (in-package :cl-test) (deftest file-position.1 - (with-open-file (is "sample-files/file-position.txt":direction :input) + (with-open-file (is "file-position.txt":direction :input) (file-position is)) 0) (deftest file-position.2 - (with-open-file (is "sample-files/file-position.txt":direction :input) + (with-open-file (is "file-position.txt":direction :input) (values (multiple-value-list (notnot-mv (file-position is :start))) @@ -20,7 +20,7 @@ (t) 0) (deftest file-position.3 - (with-open-file (is "sample-files/file-position.txt":direction :input) + (with-open-file (is "file-position.txt":direction :input) (values (multiple-value-list (notnot-mv (file-position is :end))) @@ -29,7 +29,7 @@ (deftest file-position.4 (with-open-file - (is "sample-files/file-position.txt":direction :input) + (is "file-position.txt":direction :input) (values (file-position is) (read-char is) @@ -149,7 +149,7 @@ (deftest file-position.error.3 (signals-error (with-open-file - (is "sample-files/file-position.txt" :direction :input) + (is "file-position.txt" :direction :input) (flet ((%fail () (error 'type-error))) (unless (file-position is :end) (%fail)) (let ((fp (file-position is))) @@ -161,7 +161,7 @@ (deftest file-position.error.4 (signals-error (with-open-file - (is "sample-files/file-position.txt" :direction :input) + (is "file-position.txt" :direction :input) (file-position is 1000000000000000000000)) error) t) diff --git a/streams/input-stream-p.lsp b/streams/input-stream-p.lsp index 4157f8d2239ed38a09df79ab3ee6f31696b64eba..cc2aa11a033c4504f2ffd14d90037c29e072be0c 100644 --- a/streams/input-stream-p.lsp +++ b/streams/input-stream-p.lsp @@ -14,7 +14,7 @@ t) (deftest input-stream-p.3 - (with-open-file (s "sample-files/input-stream-p.txt" :direction :input) + (with-open-file (s "input-stream-p.txt" :direction :input) (notnot-mv (input-stream-p s))) t) diff --git a/streams/listen.lsp b/streams/listen.lsp index fce4d16553d1a51e05eae4620b5e1c81f6198750..e50537254b991db42550b7c0af6820b3116a4df1 100644 --- a/streams/listen.lsp +++ b/streams/listen.lsp @@ -39,7 +39,7 @@ (deftest listen.7 (with-open-file - (s "sample-files/listen.txt") + (s "listen.txt") (values (notnot (listen s)) (handler-case diff --git a/streams/open-stream-p.lsp b/streams/open-stream-p.lsp index e86754b537d27ee3c892ac11d5cf9d39efd96164..fc8c7a63c15b58a9c0b89e8dd3472f440b3d5d3d 100644 --- a/streams/open-stream-p.lsp +++ b/streams/open-stream-p.lsp @@ -16,7 +16,7 @@ nil) (deftest open-stream-p.2 - (with-open-file (s "sample-files/open-stream-p.txt" :direction :input) + (with-open-file (s "open-stream-p.txt" :direction :input) (notnot-mv (open-stream-p s))) t) @@ -27,7 +27,7 @@ t) (deftest open-stream-p.4 - (let ((s (open "sample-files/open-stream-p.txt" :direction :input))) + (let ((s (open "open-stream-p.txt" :direction :input))) (close s) (open-stream-p s)) nil) diff --git a/streams/output-stream-p.lsp b/streams/output-stream-p.lsp index b8eb25ecedf70a03f625405c192d0facdb08dd85..f6b01301159c685b72ec214b2eb38daa2233da23 100644 --- a/streams/output-stream-p.lsp +++ b/streams/output-stream-p.lsp @@ -14,7 +14,7 @@ t) (deftest output-stream-p.3 - (with-open-file (s "sample-files/output-stream-p.txt" :direction :input) + (with-open-file (s "output-stream-p.txt" :direction :input) (output-stream-p s)) nil) diff --git a/system-construction/compile-file.lsp b/system-construction/compile-file.lsp index d0e276a9223daee9435cf2bd88e7432f89f09e96..7a60efa60c38eec2556968750b4e9c5f89dc54a6 100644 --- a/system-construction/compile-file.lsp +++ b/system-construction/compile-file.lsp @@ -64,86 +64,86 @@ (funcall funname))))))) (deftest compile-file.1 - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1) t nil) (deftest compile-file.2 - (compile-file-test "sample-files/compile-file-test-file-2.lsp" + (compile-file-test "compile-file-test-file-2.lsp" 'compile-file-test-fun.2 :expect-style-warnings t) t nil) (deftest compile-file.2a - (compile-file-test "sample-files/compile-file-test-file-2a.lsp" + (compile-file-test "compile-file-test-file-2a.lsp" 'compile-file-test-fun.2a :expect-warnings t) t nil) (deftest compile-file.3 (let ((*package* (find-package "CL-TEST"))) - (compile-file-test "sample-files/compile-file-test-file-3.lsp" + (compile-file-test "compile-file-test-file-3.lsp" 'compile-file-test-fun.3)) t nil) (deftest compile-file.4 (let ((*package* (find-package "CL-USER"))) - (compile-file-test "sample-files/compile-file-test-file-3.lsp" + (compile-file-test "compile-file-test-file-3.lsp" 'cl-user::compile-file-test-fun.3)) t nil) (deftest compile-file.5 - (compile-file-test #p"sample-files/compile-file-test-file.lsp" + (compile-file-test #p"compile-file-test-file.lsp" 'compile-file-test-fun.1) t nil) (deftest compile-file.6 - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :output-file "foo.fasl") t nil) (deftest compile-file.6a - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :output-file "foo.ufsl") t nil) (deftest compile-file.7 - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :external-format :default) t nil) (deftest compile-file.8 - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :output-file #p"foo.fasl") t nil) (deftest compile-file.9 - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :print t) t nil) (deftest compile-file.10 - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :verbose t) t nil) (deftest compile-file.11 - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :print nil) t nil) (deftest compile-file.12 - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :verbose nil) t nil) ;;; A file stream is a pathname designator (deftest compile-file.13 - (with-open-file (s "sample-files/compile-file-test-file.lsp" :direction :input) + (with-open-file (s "compile-file-test-file.lsp" :direction :input) (compile-file-test s 'compile-file-test-fun.1)) t nil) @@ -151,7 +151,7 @@ (let ((s (open "foo.fasl" :direction :output :if-exists :supersede :if-does-not-exist :create))) (close s) - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :output-file s)) t nil) @@ -159,13 +159,13 @@ (deftest compile-file.15 (let ((*readtable* (copy-readtable nil))) (set-macro-character #\! (get-macro-character #\')) - (compile-file-test "sample-files/compile-file-test-file-4.lsp" + (compile-file-test "compile-file-test-file-4.lsp" 'compile-file-test-fun.4)) t foo) ;;; Tests for *compile-file-truename*, *compile-file-pathname* (deftest compile-file.16 - (let* ((file #p"sample-files/compile-file-test-file-5.lsp") + (let* ((file #p"compile-file-test-file-5.lsp") (target-pathname (compile-file-pathname file)) (*compile-print* nil) (*compile-verbose* nil)) @@ -193,19 +193,19 @@ (let ((file (logical-pathname "CLTEST:COMPILE-FILE-TEST-LP.OUT"))) (with-open-file (s file :direction :output :if-exists :supersede :if-does-not-exist :create)) - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :output-file file)) t nil) (deftest compile-file.19 - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :*compile-verbose* t) t nil) (deftest compile-file.20 - (compile-file-test "sample-files/compile-file-test-file.lsp" + (compile-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :*compile-print* t) t nil) @@ -221,7 +221,7 @@ ;;; Error cases (deftest compile-file.error.1 - (signals-error (compile-file "sample-files/nonexistent-file-to-compile.lsp") + (signals-error (compile-file "nonexistent-file-to-compile.lsp") file-error) t) (deftest compile-file.error.2 diff --git a/system-construction/load-file.lsp b/system-construction/load-file.lsp index 09627e5ae7062fea1bf2a5ce9b2f9f906f513b2c..f017a88be33abbb2813240495136269083019d9d 100644 --- a/system-construction/load-file.lsp +++ b/system-construction/load-file.lsp @@ -36,11 +36,11 @@ (funcall funname)))) (deftest load.1 - (load-file-test "sample-files/compile-file-test-file.lsp" + (load-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1) t nil) (deftest load.2 - (load-file-test #p"sample-files/compile-file-test-file.lsp" + (load-file-test #p"compile-file-test-file.lsp" 'compile-file-test-fun.1) t nil) (deftest load.3 @@ -50,25 +50,25 @@ t good) (deftest load.4 - (load-file-test "sample-files/compile-file-test-file.lsp" + (load-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :external-format :default) t nil) (deftest load.5 - (load-file-test "sample-files/compile-file-test-file.lsp" + (load-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :verbose t) t nil) (deftest load.6 - (load-file-test "sample-files/compile-file-test-file.lsp" + (load-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :*load-verbose* t) t nil) (deftest load.7 - (load-file-test "sample-files/compile-file-test-file.lsp" + (load-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :*load-verbose* t :verbose nil) t nil) @@ -80,25 +80,25 @@ t good) (deftest load.9 - (load-file-test "sample-files/compile-file-test-file.lsp" + (load-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :print t) t nil) (deftest load.10 - (load-file-test "sample-files/compile-file-test-file.lsp" + (load-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :*load-print* t) t nil) (deftest load.11 - (load-file-test "sample-files/compile-file-test-file.lsp" + (load-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :*load-print* t :print nil) t nil) (deftest load.12 - (load-file-test "sample-files/compile-file-test-file.lsp" + (load-file-test "compile-file-test-file.lsp" 'compile-file-test-fun.1 :*load-print* nil :print t) t nil) @@ -110,7 +110,7 @@ t good) (deftest load.14 - (load "sample-files/nonexistent-file.lsp" :if-does-not-exist nil) + (load "nonexistent-file.lsp" :if-does-not-exist nil) nil) (defpackage LOAD-TEST-PACKAGE (:use "COMMON-LISP")) @@ -156,7 +156,7 @@ (t good) !FOO) (deftest load.17 - (let ((file #p"sample-files/load-test-file.lsp")) + (let ((file #p"load-test-file.lsp")) (fmakunbound 'load-file-test-fun.1) (fmakunbound 'load-file-test-fun.2) (values @@ -173,7 +173,7 @@ ;;; properly when loading compiled files (deftest load.18 - (let* ((file "sample-files/load-test-file-2.lsp") + (let* ((file "load-test-file-2.lsp") (target (enough-namestring (compile-file-pathname file)))) (declare (special *load-test-var.1* *load-test-var.2*)) (compile-file file) @@ -220,7 +220,7 @@ ;;; Error tests (deftest load.error.1 - (signals-error (load "sample-files/nonexistent-file.lsp") + (signals-error (load "nonexistent-file.lsp") file-error) t) (deftest load.error.2 @@ -228,5 +228,5 @@ t) (deftest load.error.3 - (signals-error (load "sample-files/compile-file-test-file.lsp" :bad-key-arg + (signals-error (load "compile-file-test-file.lsp" :bad-key-arg t) program-error) t) diff --git a/system-construction/modules.lsp b/system-construction/modules.lsp index 9e66d42f16db3a6a851072e872379b0797df5cd2..4fb6bee2b2eb389fc7db7367bd7c6fa63ba09e7f 100644 --- a/system-construction/modules.lsp +++ b/system-construction/modules.lsp @@ -44,7 +44,7 @@ (let ((*modules* *modules*) (fn 'modules7-fun)) (when (fboundp fn) (fmakunbound fn)) - (require "MODULES-7" #p"sample-files/modules7.lsp") + (require "MODULES-7" #p"modules7.lsp") (funcall fn)) :good) @@ -53,8 +53,8 @@ (fns '(modules8a-fun modules8b-fun))) (dolist (fn fns) (when (fboundp fn) (fmakunbound fn))) - (require "MODULES-8" '(#p"sample-files/modules8a.lsp" - #p"sample-files/modules8b.lsp")) + (require "MODULES-8" '(#p"modules8a.lsp" + #p"modules8b.lsp")) (mapcar #'funcall fns)) (:good :also-good)) diff --git a/types-and-classes/class-precedence-lists.lsp b/types-and-classes/class-precedence-lists.lsp index d669ac762d6a083719cfa64c3670decb615499cc..96a728adf4ceb46268de66bd781013b7014c8fcd 100644 --- a/types-and-classes/class-precedence-lists.lsp +++ b/types-and-classes/class-precedence-lists.lsp @@ -97,7 +97,7 @@ (make-echo-stream (make-string-input-stream "foo") out)) (echo-stream stream t)) -(def-cpl-test (open "sample-files/class-precedence-lists.txt" :direction :probe) +(def-cpl-test (open "class-precedence-lists.txt" :direction :probe) (file-stream stream t)) (def-cpl-test 1.0s0 (float real number t) float-cpl.1)