summaryrefslogtreecommitdiffstats
path: root/QA
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2009-07-31 18:38:11 (GMT)
committerKevin Smith <git@kismith.co.uk>2009-07-31 18:38:11 (GMT)
commit99b65c4dd72105755a7cf95297c9cf69dcbc6446 (patch)
treec6c862f6ef33b2260c44c0229b29f65351223e7c /QA
parentfed11bbc3bffd383e097ea63bb92442ce2daf6ed (diff)
parentaa60aa80d2d170a536c246ef6c221f92de7dd8ed (diff)
downloadswift-99b65c4dd72105755a7cf95297c9cf69dcbc6446.zip
swift-99b65c4dd72105755a7cf95297c9cf69dcbc6446.tar.bz2
Merge commit 'origin/master' into roster
Diffstat (limited to 'QA')
-rw-r--r--QA/UnitTest/Makefile.inc2
-rw-r--r--QA/UnitTest/template/FooTest.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/QA/UnitTest/Makefile.inc b/QA/UnitTest/Makefile.inc
index 531f616..f51828e 100644
--- a/QA/UnitTest/Makefile.inc
+++ b/QA/UnitTest/Makefile.inc
@@ -6,7 +6,7 @@ UNITTEST_OBJECTS = \
TEST_TARGETS += check
-CLEANFILES += $(UNITTEST_OBJECTS) $(UNITTEST_TARGET)
+CLEANFILES += $(UNITTEST_TARGET)
DEPS += $(UNITTEST_SOURCES:.cpp=.dep)
.PHONY: check
diff --git a/QA/UnitTest/template/FooTest.cpp b/QA/UnitTest/template/FooTest.cpp
index b6b9abf..9657360 100644
--- a/QA/UnitTest/template/FooTest.cpp
+++ b/QA/UnitTest/template/FooTest.cpp
@@ -9,8 +9,6 @@ class FooTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE_END();
public:
- FooTest() {}
-
void setUp() {
}