2011-06-10 22:31:26

by Andreas Dilger

[permalink] [raw]
Subject: [PATCH] e2fsprogs: ignore generated files for "git status"

Ignore files generated by "make" or "make check" in "git status".
Ignore backup files from editing files and generated tags files.
Delete a temporary file in tests/d_loaddump/script at test cleanup.

Signed-off-by: Andreas Dilger <[email protected]>
---
.gitignore | 46 ++++++++++++++++++++++++++++++++++++++++++++++
tests/d_loaddump/script | 2 +-
2 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 99ab2b2..3841a57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ FILES
patches
Makefile
*.o
+*.orig
+*.swp
MCONFIG
asm_types.h
config.log
@@ -36,15 +38,36 @@ e2fsck/e2fsck.static
e2fsck/gen_crc32table
e2fsck/prof_err.c
e2fsck/prof_err.h
+e2fsck/tst_crc32
+e2fsck/tst_problem
+e2fsck/tst_refcount
+e2fsck/tst_region
e2fsprogs.spec
+lib/blkid/blkid.h
lib/blkid/blkid.pc
lib/blkid/blkid_types.h
lib/blkid/libblkid.3
lib/blkid/libblkid.a
lib/blkid/subdirs
+lib/blkid/test_probe
+lib/blkid/tests/*.ok
+lib/blkid/tests/*.out
+lib/blkid/tst_cache
+lib/blkid/tst_dev
+lib/blkid/tst_devname
+lib/blkid/tst_devno
+lib/blkid/tst_getsize
+lib/blkid/tst_probe
+lib/blkid/tst_read
+lib/blkid/tst_resolve
+lib/blkid/tst_save
+lib/blkid/tst_tag
+lib/blkid/tst_types
lib/e2p/e2p.pc
lib/e2p/libe2p.a
lib/e2p/subdirs
+lib/e2p/tst_feature
+lib/e2p/tst_ostype
lib/et/com_err.pc
lib/et/compile_et
lib/et/libcom_err.a
@@ -56,6 +79,13 @@ lib/ext2fs/ext2_types.h
lib/ext2fs/ext2fs.pc
lib/ext2fs/libext2fs.a
lib/ext2fs/subdirs
+lib/ext2fs/tst_badblocks
+lib/ext2fs/tst_bitops
+lib/ext2fs/tst_csum
+lib/ext2fs/tst_icount
+lib/ext2fs/tst_iscan
+lib/ext2fs/tst_super_size
+lib/ext2fs/tst_types
lib/libblkid.a
lib/libcom_err.a
lib/libe2p.a
@@ -69,10 +99,15 @@ lib/ss/ss_err.c
lib/ss/ss_err.h
lib/ss/std_rqs.c
lib/ss/subdirs
+lib/ss/test.diff
+lib/ss/test_cmd.c
+lib/ss/test_out
+lib/ss/test_ss
lib/uuid/libuuid.a
lib/uuid/subdirs
lib/uuid/tst_uuid
lib/uuid/uuid.3
+lib/uuid/uuid.h
lib/uuid/uuid.pc
lib/uuid/uuid_clear.3
lib/uuid/uuid_compare.3
@@ -86,6 +121,8 @@ lib/uuid/uuid_types.h
lib/uuid/uuid_unparse.3
misc/badblocks
misc/badblocks.8
+misc/base_device
+misc/base_device.out
misc/blkid
misc/blkid.8
misc/chattr
@@ -131,8 +168,17 @@ public_config.h
resize/resize2fs
resize/resize2fs.8
resize/test_extent
+resize/test_extent.out
+tags
+TAGS
tests/progs/test_icount
tests/progs/test_icount_cmds.c
+tests/*.ok
+tests/*.failed
+tests/*.log
+tests/*.log
+tests/mke2fs.conf
+tests/test_script
util/gen-tarball
util/subst
util/subst.conf
diff --git a/tests/d_loaddump/script b/tests/d_loaddump/script
index 70dfdef..3ac1f80 100644
--- a/tests/d_loaddump/script
+++ b/tests/d_loaddump/script
@@ -45,7 +45,7 @@ echo Exit status is $status >> $OUT
# Do the verification
#

-rm -f $test_name.ok $test_name.failed $VERIFY_DATA $TEST_DATA $TMPFILE
+rm -f $test_name.ok $test_name.failed $VERIFY_DATA $TEST_DATA $TMPFILE $OUT.new
cmp -s $OUT $EXP
status=$?

--
1.7.3.4