From 8e5f65e9229d8ab54b3057505569061e856582d0 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 7 Dec 2015 00:29:20 +0000
Subject: [PATCH] Remove Temp* files from the tests directory upon running make
 clean, set & unset file permissions for InvalidPermissions.vcf on make test
 and make distclean.

---
 source/Makefile.in         | 6 ++++--
 source/tests/test.commands | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/Makefile.in b/source/Makefile.in
index 68f72a0..fe89db5 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -129,13 +129,15 @@ imexobjs: $(IMEXOBJS)
 clean:
 	rm -f $(XAB_OUT) $(BMCO_HELP) tools/bitmapcode.o *.o \
 	vcard/*.o common/*.o carddav/*.o contacteditor/*.o search/*.o \
-	widgets/*.o export/*.o import/*.o actmgr/*.o tests/$(XAB_OUT)_test
+	widgets/*.o export/*.o import/*.o actmgr/*.o tests/$(XAB_OUT)_test \
+	tests/Temp*
 
 distclean: clean
 	rm -f Makefile config.status config.log bitmapsdone \
 	tools/bitmapcode.helper bitmaps.h
 	find bitmaps -name "*.cpp" -type f -delete
 	find bitmaps -name "*.h" -type f -delete
+	chmod 644 tests/InvalidPermissions.vcf
 
 bitmaphelperobjs: $(BMCOOBJS)
 
@@ -150,4 +152,4 @@ uninstall:
 	rm @BINDIR@/$(XAB_OUT)
 
 test:
-	@GTEST@
+@GTEST@
diff --git a/source/tests/test.commands b/source/tests/test.commands
index 1eedcb4..1c0214e 100644
--- a/source/tests/test.commands
+++ b/source/tests/test.commands
@@ -1 +1,2 @@
-$(CPP) $(CPPFLAGS) -pthread -I. convert.cpp common/textprocessing.cpp vcard/vcard34conv.cpp vcard/vcard34conv-v3conv.cpp vcard/vcard34conv-v4conv.cpp vcard/vcard.cpp tests/xestiaab_test.cpp -o tests/$(XAB_OUT)_test $(CPPLIBS) -lgtest
+	$(CPP) $(CPPFLAGS) -pthread -I. convert.cpp common/textprocessing.cpp vcard/vcard34conv.cpp vcard/vcard34conv-v3conv.cpp vcard/vcard34conv-v4conv.cpp vcard/vcard.cpp tests/xestiaab_test.cpp -o tests/$(XAB_OUT)_test $(CPPLIBS) -lgtest
+	chmod 000 tests/InvalidPermissions.vcf
-- 
2.39.5