diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-25 23:26:28 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-26 00:46:20 +0200 |
commit | df73f4115cfe4d07e4159adf087571687eb173ec (patch) | |
tree | eba472d8e47d09f15159a0463f3461ef03c678cd /unoxml | |
parent | 2e7f83e87907ec05b1f22e9ff1d8c681c94ece23 (diff) |
Remove unused files and move test to qa/
Change-Id: Ia8c022c958f5547d710f9cb196672b89292bbb49
Diffstat (limited to 'unoxml')
-rw-r--r-- | unoxml/CppunitTest_unoxml_domtest.mk | 2 | ||||
-rw-r--r-- | unoxml/qa/unit/domtest.cxx (renamed from unoxml/test/domtest.cxx) | 2 | ||||
-rw-r--r-- | unoxml/test/export.map | 25 | ||||
-rw-r--r-- | unoxml/test/makefile.mk | 95 |
4 files changed, 1 insertions, 123 deletions
diff --git a/unoxml/CppunitTest_unoxml_domtest.mk b/unoxml/CppunitTest_unoxml_domtest.mk index 692d51c5498a..127a76776ef4 100644 --- a/unoxml/CppunitTest_unoxml_domtest.mk +++ b/unoxml/CppunitTest_unoxml_domtest.mk @@ -10,7 +10,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,unoxml_domtest)) $(eval $(call gb_CppunitTest_add_exception_objects,unoxml_domtest, \ - unoxml/test/domtest \ + unoxml/qa/unit/domtest \ )) $(eval $(call gb_CppunitTest_use_api,unoxml_domtest,\ diff --git a/unoxml/test/domtest.cxx b/unoxml/qa/unit/domtest.cxx index 07d173807c12..49eefe0997eb 100644 --- a/unoxml/test/domtest.cxx +++ b/unoxml/qa/unit/domtest.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/xml/sax/XSAXSerializable.hpp> #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp> -#include "../source/dom/documentbuilder.hxx" -using namespace ::DOM; using namespace ::comphelper; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/unoxml/test/export.map b/unoxml/test/export.map deleted file mode 100644 index 06b6a4a9286b..000000000000 --- a/unoxml/test/export.map +++ /dev/null @@ -1,25 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -UDK_3_0_0 { - global: - registerAllTestFunction; - - local: - *; -}; diff --git a/unoxml/test/makefile.mk b/unoxml/test/makefile.mk deleted file mode 100644 index 682cedb2a624..000000000000 --- a/unoxml/test/makefile.mk +++ /dev/null @@ -1,95 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=unoxml -TARGET=tests -TARGETTYPE=GUI - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -# --- Common ---------------------------------------------------------- - -# BEGIN ---------------------------------------------------------------- -# auto generated Target:tests by codegen.pl -SHL1OBJS= \ - $(SLO)$/domtest.obj - -# the following three libs are a bit of a hack: cannot link against -# unoxml here, because not yet delivered (and does not export -# ~anything). Need the functionality to test, so we're linking it in -# statically. Need to keep this in sync with -# source/services/makefile.mk -SHL1LIBS= \ - $(SLB)$/domimpl.lib \ - $(SLB)$/xpathimpl.lib \ - $(SLB)$/eventsimpl.lib - -SHL1TARGET= tests -SHL1STDLIBS= \ - $(UCBHELPERLIB) \ - $(LIBXML2LIB) \ - $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPUNITLIB) \ - $(CPPULIB) \ - $(SAXLIB) \ - $(SALLIB)\ - $(EXPATASCII3RDLIB) - -SHL1IMPLIB= i$(SHL1TARGET) - -DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = export.map - -# END ------------------------------------------------------------------ - -#------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies -SLOFILES=$(SHL1OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : _cppunit.mk - -# --- Fake uno bootstrap ------------------------ - -$(BIN)$/unoxml_unittest_test.ini : makefile.mk - rm -f $@ - @echo UNO_SERVICES= > $@ - @echo UNO_TYPES=$(UNOUCRRDB:s/\/\\/) >> $@ - -# --- Enable testshl2 execution in normal build ------------------------ - -$(MISC)$/unoxml_unittest_succeeded : $(SHL1TARGETN) $(BIN)$/unoxml_unittest_test.ini - @echo ---------------------------------------------------------- - @echo - start unit test on library $(SHL1TARGETN) - @echo ---------------------------------------------------------- - $(TESTSHL2) -forward $(BIN)$/ -sf $(mktmp ) $(SHL1TARGETN) - $(TOUCH) $@ - -ALLTAR : $(MISC)$/unoxml_unittest_succeeded |