From bd26ba0f0b208e096a7c3068f8c62f846ad83824 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 27 Feb 2011 16:01:18 -0600 Subject: [PATCH] Rename test-fs.img to testfs.img and add it to the clean target. --- Makefile | 4 +++- t/test-meta.sh | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7e29584..cbf548c 100644 --- 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 c0dd89a..1b99bf5 100755 --- 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 -- 2.39.2