Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-06-10 17:56:53 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-06-10 18:13:11 (GMT) |
| commit | a17bb9f842aca9ad9b414237ad576aa7a887349e (patch) | |
| tree | 08ed44da292d4ff82def9f0b135a17e20536b7b8 | |
| parent | e2f5588d089e4d2148762ea092e032976254a467 (diff) | |
| download | swift-contrib-a17bb9f842aca9ad9b414237ad576aa7a887349e.zip swift-contrib-a17bb9f842aca9ad9b414237ad576aa7a887349e.tar.bz2 | |
Moved Swiften/QA/UnitTest to QA/UnitTest.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | QA/Makefile.inc | 9 | ||||
| -rw-r--r-- | QA/UnitTest/Makefile.inc (renamed from Swiften/QA/UnitTest/Makefile.inc) | 4 | ||||
| -rw-r--r-- | QA/UnitTest/checker.cpp (renamed from Swiften/QA/UnitTest/checker.cpp) | 0 | ||||
| -rw-r--r-- | QA/UnitTest/template/FooTest.cpp (renamed from Swiften/QA/UnitTest/template/FooTest.cpp) | 0 | ||||
| -rw-r--r-- | QA/valgrind.supp (renamed from Swiften/QA/valgrind.supp) | 0 | ||||
| -rw-r--r-- | Swiften/Makefile.inc | 1 | ||||
| -rw-r--r-- | Swiften/QA/Makefile.inc | 9 | ||||
| -rw-r--r-- | Swiften/QA/NetworkTest/Makefile.inc | 2 |
9 files changed, 14 insertions, 13 deletions
@@ -44,7 +44,7 @@ include 3rdParty/Expat/Makefile.inc include 3rdParty/SQLite/Makefile.inc include Swiften/Makefile.inc include Swift/Makefile.inc -include Swiften/QA/Makefile.inc +include QA/Makefile.inc ################################################################################ # Main targets diff --git a/QA/Makefile.inc b/QA/Makefile.inc new file mode 100644 index 0000000..e86005d --- /dev/null +++ b/QA/Makefile.inc @@ -0,0 +1,9 @@ +ifdef USE_VALGRIND +# Not enabled: --show-reachable=yes +TEST_RUNNER=valgrind --suppressions=QA/valgrind.supp -q --leak-check=full --track-origins=yes +endif + +include QA/UnitTest/Makefile.inc + +.PHONY: test +test: $(TEST_TARGETS) diff --git a/Swiften/QA/UnitTest/Makefile.inc b/QA/UnitTest/Makefile.inc index 5bdbec9..820fb64 100644 --- a/Swiften/QA/UnitTest/Makefile.inc +++ b/QA/UnitTest/Makefile.inc @@ -1,6 +1,6 @@ -UNITTEST_TARGET = Swiften/QA/UnitTest/checker +UNITTEST_TARGET = QA/UnitTest/checker UNITTEST_SOURCES += \ - Swiften/QA/UnitTest/checker.cpp + QA/UnitTest/checker.cpp UNITTEST_OBJECTS = \ $(UNITTEST_SOURCES:.cpp=.o) diff --git a/Swiften/QA/UnitTest/checker.cpp b/QA/UnitTest/checker.cpp index ea4f0d9..ea4f0d9 100644 --- a/Swiften/QA/UnitTest/checker.cpp +++ b/QA/UnitTest/checker.cpp diff --git a/Swiften/QA/UnitTest/template/FooTest.cpp b/QA/UnitTest/template/FooTest.cpp index b6b9abf..b6b9abf 100644 --- a/Swiften/QA/UnitTest/template/FooTest.cpp +++ b/QA/UnitTest/template/FooTest.cpp diff --git a/Swiften/QA/valgrind.supp b/QA/valgrind.supp index 5e2ee00..5e2ee00 100644 --- a/Swiften/QA/valgrind.supp +++ b/QA/valgrind.supp diff --git a/Swiften/Makefile.inc b/Swiften/Makefile.inc index bb93bf8..12323db 100644 --- a/Swiften/Makefile.inc +++ b/Swiften/Makefile.inc @@ -42,4 +42,5 @@ lib: $(SWIFTEN_TARGET) $(SWIFTEN_TARGET): $(SWIFTEN_OBJECTS) $(QUIET_AR)$(AR) $(ARFLAGS) $@ $(SWIFTEN_OBJECTS) +include Swiften/QA/Makefile.inc include Swiften/Examples/Makefile.inc diff --git a/Swiften/QA/Makefile.inc b/Swiften/QA/Makefile.inc index dc3a0bf..831b443 100644 --- a/Swiften/QA/Makefile.inc +++ b/Swiften/QA/Makefile.inc @@ -1,11 +1,2 @@ -ifdef USE_VALGRIND -# Not enabled: --show-reachable=yes -TEST_RUNNER=valgrind --suppressions=Swiften/QA/valgrind.supp -q --leak-check=full --track-origins=yes -endif - -include Swiften/QA/UnitTest/Makefile.inc include Swiften/QA/NetworkTest/Makefile.inc include Swiften/QA/ClientTest/Makefile.inc - -.PHONY: test -test: $(TEST_TARGETS) diff --git a/Swiften/QA/NetworkTest/Makefile.inc b/Swiften/QA/NetworkTest/Makefile.inc index 3638f2f..055937b 100644 --- a/Swiften/QA/NetworkTest/Makefile.inc +++ b/Swiften/QA/NetworkTest/Makefile.inc @@ -2,7 +2,7 @@ NETWORKTEST_TARGET += Swiften/QA/NetworkTest/checker NETWORKTEST_SOURCES += \ Swiften/QA/NetworkTest/DomainNameResolverTest.cpp \ Swiften/QA/NetworkTest/BoostConnectionTest.cpp \ - Swiften/QA/UnitTest/checker.cpp + QA/UnitTest/checker.cpp NETWORKTEST_OBJECTS = \ $(NETWORKTEST_SOURCES:.cpp=.o) |