diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-05 17:22:00 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-05 17:22:00 +0100 |
| commit | 37b4f602469194b4948be6e23a9dcfc7cf328f27 (patch) | |
| tree | 9e756c2e1e3fed19eee20cb059ec002655b1a1ae | |
| parent | e8b6afc4c46878bed6ac17b08985c018bb6d28a2 (diff) | |
gnumake3: first cppunit test in new build system
| -rwxr-xr-x | sfx2/TestFixture_metadatable.mk | 15 | ||||
| -rw-r--r-- | sfx2/qa/cppunit/test_metadatable.cxx | 10 |
2 files changed, 12 insertions, 13 deletions
diff --git a/sfx2/TestFixture_metadatable.mk b/sfx2/TestFixture_metadatable.mk index 066f405467f2..f41a25a16747 100755 --- a/sfx2/TestFixture_metadatable.mk +++ b/sfx2/TestFixture_metadatable.mk @@ -25,14 +25,21 @@ # #************************************************************************* -$(eval $(call gb_Testfixture_TestFixture,metadatable)) +$(eval $(call gb_TestFixture_TestFixture,sfx2_metadatable)) -$(eval $(call gb_Testfixture_add_exception_objects,metadatable, \ - sfx2/qa/cppunit/test_metadatable.cxx \ +$(eval $(call gb_TestFixture_add_exception_objects,sfx2_metadatable, \ + sfx2/qa/cppunit/test_metadatable \ )) -$(eval $(call gb_Testfixture_add_linked_libs,metadatable, \ +$(eval $(call gb_TestFixture_add_linked_libs,sfx2_metadatable, \ + sal \ sfx \ )) +$(eval $(call gb_TestFixture_set_include,sfx2_metadatable,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 6a0be13a9c53..9930d61acf20 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -25,15 +25,7 @@ * ************************************************************************/ -#include "precompiled_sfx2.hxx" - -#include "preextstl.h" -#include <cppunit/TestAssert.h> -#include <cppunit/TestFixture.h> -#include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> -#include "postextstl.h" - +#include <sal/cppunit.h> #include <rtl/ustrbuf.hxx> #include <com/sun/star/util/DateTime.hpp> |