sw/qa/extras/inc/swmodeltestbase.hxx | 3 +++
sw/qa/extras/odfimport/odfimport.cxx | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit f7b86315078f4fcdf7b6a6295abdfba2378f3601
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Oct 14 11:31:36 2014 +0200
CppunitTest_sw_odfimport: allow running a single test only
Change-Id: I6dac6c98cd60955cf54e9e8554691566d29a34f1
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index ace74f6..8048b8c 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -91,6 +91,7 @@ using namespace css;
#define DECLARE_OOXMLEXPORT_TEST(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
#define DECLARE_RTFIMPORT_TEST(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
#define DECLARE_RTFEXPORT_TEST(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
+#define DECLARE_ODFIMPORT_TEST(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
// For testing during development of a test, you want to use
// DECLARE_OOXMLEXPORT_TEST_ONLY, and change the above to #if 0
@@ -100,12 +101,14 @@ using namespace css;
#define DECLARE_OOXMLEXPORT_TEST_ONLY(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
#define DECLARE_RTFIMPORT_TEST_ONLY(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
#define DECLARE_RTFEXPORT_TEST_ONLY(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
+#define DECLARE_ODFIMPORT_TEST_ONLY(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
#undef DECLARE_OOXMLEXPORT_TEST
#define DECLARE_OOXMLIMPORT_TEST(TestName, filename) class disabled##TestName
: public Test { void disabled(); }; void disabled##TestName::disabled()
#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) class disabled##TestName
: public Test { void disabled(); }; void disabled##TestName::disabled()
#define DECLARE_RTFIMPORT_TEST(TestName, filename) class disabled##TestName :
public Test { void disabled(); }; void disabled##TestName::disabled()
#define DECLARE_RTFEXPORT_TEST(TestName, filename) class disabled##TestName :
public Test { void disabled(); }; void disabled##TestName::disabled()
+#define DECLARE_ODFIMPORT_TEST(TestName, filename) class disabled##TestName :
public Test { void disabled(); }; void disabled##TestName::disabled()
#endif
#define DECLARE_SW_IMPORT_TEST(TestName, filename, BaseClass) \
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index bb6ee13..18de668 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -33,8 +33,6 @@ class Test : public SwModelTestBase
Test() : SwModelTestBase("/sw/qa/extras/odfimport/data/", "writer8") {}
};
-#define DECLARE_ODFIMPORT_TEST(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
-
DECLARE_ODFIMPORT_TEST(testEmptySvgFamilyName, "empty-svg-family-name.odt")
{
// .odt import did crash on the empty font list (which I think is valid
according SVG spec)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
