Raymond Toy pushed to branch issue-373-handle-temp-files at cmucl / cmucl

Commits:

1 changed file:

Changes:

  • tests/unix.lisp
    ... ... @@ -7,19 +7,6 @@
    7 7
     
    
    8 8
     (define-test mkstemp.name-returned
    
    9 9
       (:tag :issues)
    
    10
    -<<<<<<< HEAD
    
    11
    -  (let (fd name)
    
    12
    -    (unwind-protect
    
    13
    -	 (progn
    
    14
    -	   (multiple-value-setq (fd name)
    
    15
    -	     (unix::unix-mkstemp "test-XXXXXX"))
    
    16
    -	   (assert-true fd)
    
    17
    -	   (assert-false (search "XXXXXX" name)))
    
    18
    -      (when fd
    
    19
    -	(unix:unix-unlink name)))))
    
    20
    -
    
    21
    -(define-test mkstemp.name-returned.2
    
    22
    -=======
    
    23 10
       (let (fd filename)
    
    24 11
         (unwind-protect
    
    25 12
     	 (progn
    
    ... ... @@ -34,7 +21,6 @@
    34 21
     	(unix:unix-unlink filename)))))
    
    35 22
     
    
    36 23
     (define-test mkstemp.non-ascii-name-returned
    
    37
    ->>>>>>> master
    
    38 24
       (:tag :issues)
    
    39 25
       (let ((unix::*filename-encoding* :utf-8)
    
    40 26
     	fd name)
    
    ... ... @@ -76,7 +62,7 @@
    76 62
           (when name
    
    77 63
     	(unix:unix-rmdir name)))))
    
    78 64
     
    
    79
    -(define-test mkdtemp.name-returned.2
    
    65
    +(define-test mkdtemp.non-ascii-name-returned
    
    80 66
       (:tag :issues)
    
    81 67
       (let ((unix::*filename-encoding* :utf-8)
    
    82 68
     	name)
    
    ... ... @@ -101,3 +87,5 @@
    101 87
           (unix::unix-mkdtemp "random-dir/dir-XXXXXX")
    
    102 88
         (assert-false result)
    
    103 89
         (assert-true (and (integerp errno) (plusp errno)))))
    
    90
    +
    
    91
    +