diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-02-23 08:00:02 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-23 10:31:24 +0000 |
commit | 3313f7a555300bdce3fe18117386397431b4202b (patch) | |
tree | 447b4ce8f6fb6fd9c45284f4e0d39e0a6c1077e7 /tools | |
parent | workben urltest duplicates qa/urlobj cppunit test (diff) | |
download | core-3313f7a555300bdce3fe18117386397431b4202b.tar.gz core-3313f7a555300bdce3fe18117386397431b4202b.zip |
merge cppunit test dirs together
drop archaic makefile.mks and export.maps and use consistent naming
Diffstat (limited to 'tools')
-rw-r--r-- | tools/CppunitTest_tools_test.mk | 6 | ||||
-rw-r--r-- | tools/qa/cppunit/test_inetmime.cxx (renamed from tools/qa/cppunit/inetmimetest.cxx) | 0 | ||||
-rw-r--r-- | tools/qa/cppunit/test_urlobj.cxx (renamed from tools/qa/urlobj/tools_urlobj_test.cxx) | 0 | ||||
-rw-r--r-- | tools/qa/urlobj/export.map | 7 | ||||
-rw-r--r-- | tools/qa/urlobj/makefile.mk | 66 |
5 files changed, 3 insertions, 76 deletions
diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index 608c2a4e51ee..c347e12f4861 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -31,11 +31,11 @@ $(eval $(call gb_CppunitTest_CppunitTest,tools_test)) $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \ - tools/qa/cppunit/inetmimetest \ - tools/qa/cppunit/test_reversemap \ + tools/qa/cppunit/test_inetmime \ tools/qa/cppunit/test_pathutils \ + tools/qa/cppunit/test_reversemap \ tools/qa/cppunit/test_stream \ - tools/qa/urlobj/tools_urlobj_test \ + tools/qa/cppunit/test_urlobj \ )) $(eval $(call gb_CppunitTest_add_api,tools_test, \ diff --git a/tools/qa/cppunit/inetmimetest.cxx b/tools/qa/cppunit/test_inetmime.cxx index 4fd6e2b0c84e..4fd6e2b0c84e 100644 --- a/tools/qa/cppunit/inetmimetest.cxx +++ b/tools/qa/cppunit/test_inetmime.cxx diff --git a/tools/qa/urlobj/tools_urlobj_test.cxx b/tools/qa/cppunit/test_urlobj.cxx index da11113111d1..da11113111d1 100644 --- a/tools/qa/urlobj/tools_urlobj_test.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx diff --git a/tools/qa/urlobj/export.map b/tools/qa/urlobj/export.map deleted file mode 100644 index 8c1ebd8cfe1f..000000000000 --- a/tools/qa/urlobj/export.map +++ /dev/null @@ -1,7 +0,0 @@ - UDK_3.0 { - global: - registerAllTestFunction; - - local: - *; - }; diff --git a/tools/qa/urlobj/makefile.mk b/tools/qa/urlobj/makefile.mk deleted file mode 100644 index 09745b1103d6..000000000000 --- a/tools/qa/urlobj/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ - #************************************************************************* - # - # Version: MPL 1.1 / GPLv3+ / LGPLv3+ - # - # The contents of this file are subject to the Mozilla Public License Version - # 1.1 (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.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS IS" basis, - # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - # for the specific language governing rights and limitations under the - # License. - # - # The Initial Developer of the Original Code is - # [ insert your name / company etc. here eg. Jim Bob <jim@bob.org> ] - # Portions created by the Initial Developer are Copyright (C) 2010 the - # Initial Developer. All Rights Reserved. - # - # Contributor(s): Florian Reuter <freuter@novell.com> - # - # Alternatively, the contents of this file may be used under the terms of - # either the GNU General Public License Version 3 or later (the "GPLv3+"), or - # the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - # instead of those above. - #************************************************************************* - - PRJ=..$/.. - - PRJNAME=tools - TARGET=qa_tools_urlobj_test - # this is removed at the moment because we need some enhancements - # TESTDIR=TRUE - - ENABLE_EXCEPTIONS=TRUE - - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk - - # BEGIN ---------------------------------------------------------------- - # auto generated Target:job by codegen.pl - SHL1OBJS= \ - $(SLO)$/tools_urlobj_test.obj - - SHL1TARGET= tools_urlobj - SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) \ - $(TOOLSLIB) - - SHL1IMPLIB= i$(SHL1TARGET) - DEF1NAME =$(SHL1TARGET) - SHL1VERSIONMAP= export.map - # auto generated Target:job - # END ------------------------------------------------------------------ - - #------------------------------- All object files ------------------------------- - # do this here, so we get right dependencies - # SLOFILES=$(SHL1OBJS) - - # --- Targets ------------------------------------------------------ - - .INCLUDE : target.mk - .INCLUDE : _cppunit.mk |