[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sbcl-commits
Subject:    [Sbcl-commits] master: Use with-scratch-file
From:       Douglas Katzman via Sbcl-commits <sbcl-commits () lists ! sourceforge ! net>
Date:       2022-09-29 21:09:24
Message-ID: 1664485764.700582.27171 () sfp-scm-1 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]

The branch "master" has been updated in SBCL:
       via  173e87b490480c54760ad4d4450215a5c3e4fc3c (commit)
      from  3b3156eb05d3d02e1ba37d4fe372809b61d5ffe4 (commit)

- Log -----------------------------------------------------------------
commit 173e87b490480c54760ad4d4450215a5c3e4fc3c
Author: Douglas Katzman <dougk@google.com>
Date:   Thu Sep 29 17:05:52 2022 -0400

    Use with-scratch-file
    
    and having done that, there are no occurrences of some test-related
    strings which can now be removed from .gitignore and clean.sh
---
 .gitignore                        |  3 ---
 clean.sh                          |  4 ----
 contrib/sb-posix/posix-tests.lisp | 13 ++++++-------
 tests/input-manifest.lisp-expr    |  3 +--
 tools-for-build/wxs.lisp          |  2 +-
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index e654f0206..206850e58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,9 +47,6 @@ tools-for-build/grovel-headers
 tools-for-build/grovel-headers.exe
 tools-for-build/mmap-rwx
 tools-for-build/where-is-mcontext
-contrib/*/test-passed
-contrib/*/test-output
 contrib/asdf/asdf-upstream
-contrib/sb-cover/test-output
 doc/manual/*.html
 version.lisp-expr
diff --git a/clean.sh b/clean.sh
index c6dcea2f2..73581a07e 100755
--- a/clean.sh
+++ b/clean.sh
@@ -70,8 +70,6 @@ done
 #   *.tmp, *.lisp-temp
 #     conventional names for temporary files autogenerated in
 #     building or testing
-#   test-passed
-#     generated by automatic directory-test-thyself procedure
 find . \( \
         -name _darcs -o \
         -name '{arch}' -o \
@@ -105,7 +103,6 @@ find . \( \
         -name '*.so' -o \
         -name '*.d' -o \
         -name 'foo.c' -o \
-        -name 'test-output' -o \
         -name 'test-lab' -o \
         -name 'encodings.texi-temp' -o \
         -name 'stack-alignment-offset' -o \
@@ -120,7 +117,6 @@ find . \( \
         -name 'depend' -o \
         -name 'TAGS' -o \
         -name 'tags' -o \
-        -name 'test-passed' -o \
         -name 'local-target-features.lisp-expr' \) -print | \
     if test -f .cleanignore; then
         # Because this file deletes all symlinks, it prevents building
diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
index 475f54ea5..c78c8e7cf 100644
--- a/contrib/sb-posix/posix-tests.lisp
+++ b/contrib/sb-posix/posix-tests.lisp
@@ -546,9 +546,10 @@
     (assert (equal (sort posix-readdir #'string<)
                    (sort cl-directory #'string<)))))
 
-(deftest write.1
-    (progn
-      (let ((fd (sb-posix:open (merge-pathnames "write-test.txt" *test-directory*)
+(test-util:with-test (:name :write.1)
+  (multiple-value-bind (n str)
+     (test-util:with-scratch-file (tmpname)
+      (let ((fd (sb-posix:open tmpname
                                (logior sb-posix:o-creat sb-posix:o-wronly)
                                (logior sb-posix:s-irusr sb-posix:s-iwusr)))
             (retval nil))
@@ -557,10 +558,8 @@
                (setf retval (sb-posix:write fd (sb-sys:vector-sap buf) 3)))
           (sb-posix:close fd))
 
-        (with-open-file (inf (merge-pathnames "write-test.txt" *test-directory*)
-                             :direction :input)
-          (values retval (read-line inf)))))
-  3 "foo")
+        (with-open-file (inf tmpname) (values retval (read-line inf)))))
+    (assert (and (eql n 3) (equal str "foo")))))
 
 #-(or android win32)
 (deftest pwent.1
diff --git a/tests/input-manifest.lisp-expr b/tests/input-manifest.lisp-expr
index fa1f85ac2..fc3ca3ef4 100644
--- a/tests/input-manifest.lisp-expr
+++ b/tests/input-manifest.lisp-expr
@@ -104,8 +104,7 @@
  ("sb-mpfr.impure.lisp" "contrib/sb-gmp.fasl" "contrib/sb-mpfr.fasl"
   "../contrib/sb-mpfr/tests.lisp")
  ("sb-posix.impure.lisp" "contrib/sb-posix.fasl"
-  "../contrib/sb-posix/posix-tests.lisp" "../contrib/sb-posix/libc-tests.lisp"
-  "test-output/write-test.txt")
+  "../contrib/sb-posix/posix-tests.lisp" "../contrib/sb-posix/libc-tests.lisp")
  ("sb-simd.impure.lisp" "contrib/sb-simd.fasl"
   "../contrib/sb-simd/test-suite/packages.lisp"
   "../contrib/sb-simd/test-suite/numbers.lisp"
diff --git a/tools-for-build/wxs.lisp b/tools-for-build/wxs.lisp
index af2a5840a..a341e81b5 100644
--- a/tools-for-build/wxs.lisp
+++ b/tools-for-build/wxs.lisp
@@ -127,7 +127,7 @@
 (defun file-id (pathname)
   (id (format nil "File_~A" (enough-namestring pathname *sbcl-source-root*))))
 
-(defparameter *ignored-directories* '("CVS" ".svn" "test-output"))
+(defparameter *ignored-directories* '("CVS" ".svn"))
 
 (defparameter *pathname-type-abbrevs*
   '(("lisp" . "lsp")

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL


_______________________________________________
Sbcl-commits mailing list
Sbcl-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sbcl-commits
[prev in list] [next in list] [prev in thread] [next in thread]