create and mount disk images in /tmp

tests/generate-test-spec.el

@@ -16,9 +16,14 @@
 	  (write-test-files (apply testgen config) counter)
 	  (setq counter (1+ counter)))))))
 
+(defun disk-path (img)
+  "Generate path for disk image."
+  (format "/tmp/$(whoami)/%s" img))
+
 (defun gen-disks (numdisks)
   "Generate string with list of disks for testing."
-  (mapcar (lambda (n) (format "test-disk%d" n))
+  (mapcar (lambda (n)
+	    (disk-path (format "test-disk%d" n)))
 	  (number-sequence 1 numdisks)))
 
 (defun create-disk-cmd (numdisks size)
@@ -212,7 +217,7 @@ FS-STATE the state of the filesystem."
 It creates disks, runs mkfs on them, and mounts with FUSE."
   (string-join
    (list
-    "mkdir -p mnt"
+    "mkdir -p mnt; mkdir -p /tmp/$(whoami)"
     (create-disk-cmd numdisks "1M")
     (concat "../solution/mkfs " (default-fs-mkfs-args raid numdisks))
     (mount-cmd numdisks "mnt"))
@@ -222,8 +227,8 @@ It creates disks, runs mkfs on them, and mounts with FUSE."
   "This is always the post command for filesystem tests.
 
 It removes the test disks."
-  (format "%s; rm -f test-disk*"
-	  "fusermount -uq mnt"))
+  (format "fusermount -uq mnt; rm -f %s"
+	  (disk-path "test-disk*")))
 
 (defun mount-cmd (numdisks dir)
   "Mount wfs using NUMDISKS disks in single-threaded mode on DIR.
@@ -256,10 +261,12 @@ RUN-RC return code of run command (metadata verifier)"
   (define-test
    (concat "mkfs: " desc)
    (string-join
-    (list (create-disk-cmd numdisks "1M")
-	  (concat "../solution/mkfs " (make-mkfs-args raid numdisks inodes blocks)))
+    (list
+     "mkdir -p /tmp/$(whoami)"
+     (create-disk-cmd numdisks "1M")
+     (concat "../solution/mkfs " (make-mkfs-args raid numdisks inodes blocks)))
     "; ")
-   (format "%s" "rm -f test-disk*")
+   (format "rm -f %s" (disk-path "test-disk*"))
    (format "./wfs-check-metadata.py --mode mkfs --inodes %d --blocks %d --disks %s"
 	   (roundup inodes 32)
 	   (roundup blocks 32)
@@ -468,17 +475,21 @@ POST-BLOCKS additional blocks we should expect (e.g. no cleaning dir blocks)"
    ((testcase . ,#'filesystem-init-and-workload)
 ;;    (desc fs-state op post-state post-extra-blocks raid numdisks output rc)
     (configs . (("raid1 -- mount disks in other order" ,'()
-		  "fusermount -u mnt; ../solution/wfs test-disk4 test-disk3 test-disk2 test-disk1 -s mnt"
+		 ,(format "fusermount -u mnt; ../solution/wfs %s %s %s %s -s mnt"
+			 (disk-path "test-disk4") (disk-path "test-disk3")
+			 (disk-path "test-disk2") (disk-path "test-disk1"))
 		  ,'() 0 "1" 4 "Correct\nCorrect" 0)
 		 ("raid0 -- mount disks in other order" ,'()
-		  "fusermount -u mnt; ../solution/wfs test-disk3 test-disk2 test-disk1 -s mnt"
+		  ,(format "fusermount -u mnt; ../solution/wfs %s %s %s -s mnt"
+			  (disk-path "test-disk3") (disk-path "test-disk2") (disk-path "test-disk1"))
 		  ,'() 0 "0" 3 "Correct\nCorrect" 0)
 		 ("raid0 -- mount in other order with readback" ,'()
 		  ,(string-join
 		    (list "./read-write.py 1 50" ; create a 5000-byte file
 			  "cat mnt/file1 > file1.test" ; save the file
 			  "fusermount -u mnt" ; unmount
-			  "../solution/wfs test-disk3 test-disk2 test-disk1 -s mnt" ; remount different order
+			  (format "../solution/wfs %s %s %s -s mnt"
+				  (disk-path "test-disk3") (disk-path "test-disk2") (disk-path "test-disk1"))
 			  "diff mnt/file1 file1.test") ; should be identical
 		    "; ")
 		  ,'(("file1" . 5000)) 0 "0" 3 "Correct\nCorrect\nCorrect" 0)
@@ -487,7 +498,8 @@ POST-BLOCKS additional blocks we should expect (e.g. no cleaning dir blocks)"
 		    (list "./read-write.py 1 10"
 			  "cat mnt/file1 > file1.test"
 			  "fusermount -u mnt"
-			  "./corrupt-disk.py --disks test-disk1"
+			  (format "./corrupt-disk.py --disks %s"
+				  (disk-path "test-disk1"))
 			  (mount-cmd 3 "mnt")
 			  "diff mnt/file1 file1.test")
 		    "; ")

tests/tests/1.post

-rm -f test-disk*
+rm -f /tmp/$(whoami)/test-disk*

tests/tests/1.pre

-truncate -s 1M test-disk1; truncate -s 1M test-disk2; ../solution/mkfs -r 1 -d test-disk1 -d test-disk2 -i 32 -b 224
+mkdir -p /tmp/$(whoami); truncate -s 1M /tmp/$(whoami)/test-disk1; truncate -s 1M /tmp/$(whoami)/test-disk2; ../solution/mkfs -r 1 -d /tmp/$(whoami)/test-disk1 -d /tmp/$(whoami)/test-disk2 -i 32 -b 224

tests/tests/1.run

-./wfs-check-metadata.py --mode mkfs --inodes 32 --blocks 224 --disks test-disk1 test-disk2
+./wfs-check-metadata.py --mode mkfs --inodes 32 --blocks 224 --disks /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2

tests/tests/10.post

-fusermount -uq mnt; rm -f test-disk*
+fusermount -uq mnt; rm -f /tmp/$(whoami)/test-disk*

tests/tests/10.pre

-mkdir -p mnt && truncate -s 1M test-disk1; truncate -s 1M test-disk2 && ../solution/mkfs -r 1 -d test-disk1 -d test-disk2 -i 32 -b 200 && ../solution/wfs test-disk1 test-disk2 -s mnt
+mkdir -p mnt; mkdir -p /tmp/$(whoami) && truncate -s 1M /tmp/$(whoami)/test-disk1; truncate -s 1M /tmp/$(whoami)/test-disk2 && ../solution/mkfs -r 1 -d /tmp/$(whoami)/test-disk1 -d /tmp/$(whoami)/test-disk2 -i 32 -b 200 && ../solution/wfs /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2 -s mnt

tests/tests/10.run

@@ -20,4 +20,4 @@ except Exception as e:
     exit(1)
 
 print("Correct")' \
- && fusermount -u mnt && ./wfs-check-metadata.py --mode raid1 --blocks 1 --altblocks 1 --dirs 2 --files 0 --disks test-disk1 test-disk2
+ && fusermount -u mnt && ./wfs-check-metadata.py --mode raid1 --blocks 1 --altblocks 1 --dirs 2 --files 0 --disks /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2

tests/tests/11.post

-fusermount -uq mnt; rm -f test-disk*
+fusermount -uq mnt; rm -f /tmp/$(whoami)/test-disk*

tests/tests/11.pre

-mkdir -p mnt && truncate -s 1M test-disk1; truncate -s 1M test-disk2 && ../solution/mkfs -r 1 -d test-disk1 -d test-disk2 -i 32 -b 200 && ../solution/wfs test-disk1 test-disk2 -s mnt
+mkdir -p mnt; mkdir -p /tmp/$(whoami) && truncate -s 1M /tmp/$(whoami)/test-disk1; truncate -s 1M /tmp/$(whoami)/test-disk2 && ../solution/mkfs -r 1 -d /tmp/$(whoami)/test-disk1 -d /tmp/$(whoami)/test-disk2 -i 32 -b 200 && ../solution/wfs /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2 -s mnt

tests/tests/11.run

@@ -44,4 +44,4 @@ except Exception as e:
     exit(1)
 
 print("Correct")' \
- && fusermount -u mnt && ./wfs-check-metadata.py --mode raid1 --blocks 2 --altblocks 2 --dirs 4 --files 0 --disks test-disk1 test-disk2
+ && fusermount -u mnt && ./wfs-check-metadata.py --mode raid1 --blocks 2 --altblocks 2 --dirs 4 --files 0 --disks /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2

tests/tests/12.post

-fusermount -uq mnt; rm -f test-disk*
+fusermount -uq mnt; rm -f /tmp/$(whoami)/test-disk*

tests/tests/12.pre

-mkdir -p mnt && truncate -s 1M test-disk1; truncate -s 1M test-disk2 && ../solution/mkfs -r 1 -d test-disk1 -d test-disk2 -i 32 -b 200 && ../solution/wfs test-disk1 test-disk2 -s mnt
+mkdir -p mnt; mkdir -p /tmp/$(whoami) && truncate -s 1M /tmp/$(whoami)/test-disk1; truncate -s 1M /tmp/$(whoami)/test-disk2 && ../solution/mkfs -r 1 -d /tmp/$(whoami)/test-disk1 -d /tmp/$(whoami)/test-disk2 -i 32 -b 200 && ../solution/wfs /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2 -s mnt

tests/tests/12.run

@@ -20,4 +20,4 @@ except Exception as e:
     exit(1)
 
 print("Correct")' \
- && fusermount -u mnt && ./wfs-check-metadata.py --mode raid1 --blocks 1 --altblocks 1 --dirs 1 --files 1 --disks test-disk1 test-disk2
+ && fusermount -u mnt && ./wfs-check-metadata.py --mode raid1 --blocks 1 --altblocks 1 --dirs 1 --files 1 --disks /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2

tests/tests/13.post

-fusermount -uq mnt; rm -f test-disk*
+fusermount -uq mnt; rm -f /tmp/$(whoami)/test-disk*

tests/tests/13.pre

-mkdir -p mnt && truncate -s 1M test-disk1; truncate -s 1M test-disk2 && ../solution/mkfs -r 1 -d test-disk1 -d test-disk2 -i 32 -b 200 && ../solution/wfs test-disk1 test-disk2 -s mnt
+mkdir -p mnt; mkdir -p /tmp/$(whoami) && truncate -s 1M /tmp/$(whoami)/test-disk1; truncate -s 1M /tmp/$(whoami)/test-disk2 && ../solution/mkfs -r 1 -d /tmp/$(whoami)/test-disk1 -d /tmp/$(whoami)/test-disk2 -i 32 -b 200 && ../solution/wfs /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2 -s mnt

tests/tests/13.run

@@ -92,4 +92,4 @@ except Exception as e:
     exit(1)
 
 print("Correct")' \
- && fusermount -u mnt && ./wfs-check-metadata.py --mode raid1 --blocks 2 --altblocks 2 --dirs 4 --files 4 --disks test-disk1 test-disk2
+ && fusermount -u mnt && ./wfs-check-metadata.py --mode raid1 --blocks 2 --altblocks 2 --dirs 4 --files 4 --disks /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2

tests/tests/14.post

-fusermount -uq mnt; rm -f test-disk*
+fusermount -uq mnt; rm -f /tmp/$(whoami)/test-disk*

tests/tests/14.pre

-mkdir -p mnt && truncate -s 1M test-disk1; truncate -s 1M test-disk2 && ../solution/mkfs -r 1 -d test-disk1 -d test-disk2 -i 32 -b 200 && ../solution/wfs test-disk1 test-disk2 -s mnt
+mkdir -p mnt; mkdir -p /tmp/$(whoami) && truncate -s 1M /tmp/$(whoami)/test-disk1; truncate -s 1M /tmp/$(whoami)/test-disk2 && ../solution/mkfs -r 1 -d /tmp/$(whoami)/test-disk1 -d /tmp/$(whoami)/test-disk2 -i 32 -b 200 && ../solution/wfs /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2 -s mnt

tests/tests/14.run

@@ -224,4 +224,4 @@ except Exception as e:
     exit(1)
 
 print("Correct")' \
- && fusermount -u mnt && ./wfs-check-metadata.py --mode raid1 --blocks 2 --altblocks 2 --dirs 1 --files 18 --disks test-disk1 test-disk2
+ && fusermount -u mnt && ./wfs-check-metadata.py --mode raid1 --blocks 2 --altblocks 2 --dirs 1 --files 18 --disks /tmp/$(whoami)/test-disk1 /tmp/$(whoami)/test-disk2

tests/tests/15.post

-fusermount -uq mnt; rm -f test-disk*
+fusermount -uq mnt; rm -f /tmp/$(whoami)/test-disk*