Rename test-fs.img to testfs.img and add it to the clean target.

diff --git a/Makefile b/Makefile
index 7e2958450f6f5e8a3e6b27eb854fac84947fcaae..cbf548c420bfaf624e6a06901828f0c3f5ccf0dd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -144,5 +144,7 @@ clean: Documentation/clean
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
                bup bup-* cmd/bup-* lib/bup/_version.py randomgen memtest \
-               out[12] out2[tc] tags[12] tags2[tc]
+               out[12] out2[tc] tags[12] tags2[tc] \
+               testfs.img
        rm -rf *.tmp t/*.tmp lib/*/*/*.tmp build lib/bup/build
+       if test -e testfs; then rmdir testfs; fi

diff --git a/t/test-meta.sh b/t/test-meta.sh
index c0dd89a97f23a2b212240fe6ebdb83fd194fed9b..1b99bf50aed951a308b583ae584a2f4d3f3d4ea5 100755 (executable)
--- a/t/test-meta.sh
+++ b/t/test-meta.sh
@@ -110,10 +110,10 @@ then
     WVSTART 'meta - general (as root)'
     WVPASS cd "${TOP}/bupmeta.tmp"
     umount testfs || true
-    dd if=/dev/zero of=test-fs.img bs=1M count=32
-    mke2fs -F -j -m 0 test-fs.img
+    dd if=/dev/zero of=testfs.img bs=1M count=32
+    mke2fs -F -j -m 0 testfs.img
     mkdir testfs
-    mount -o loop,acl,user_xattr test-fs.img testfs
+    mount -o loop,acl,user_xattr testfs.img testfs
     # Hide, so that tests can't create risks.
     chown root:root testfs
     chmod 0700 testfs