split 'test' into 'unotest' and 'test' to help dependencies

37 files changed, 315 insertions, 37 deletions

diff --git a/Repository.mk b/Repository.mk
index 73e591f57981..21cee990df5c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -282,6 +282,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     sofficeapp \
     store \
 	test \
+	unotest \
 	textconv_dict \
     ucb \
     ucpfile \
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 5a8b53d27c84..28a8c3914f7e 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -59,12 +59,9 @@ $(eval $(call gb_CppunitTest_add_service_rdbs,i18npool_test_breakiterator,\
 	i18npool_test_breakiterator \
 ))
 
-#
-# Disable for now - to break circular dependency ...
-#
-# $(eval $(call gb_CppunitTest_set_args,i18npool_test_breakiterator,\
-#    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
-# ))
+$(eval $(call gb_CppunitTest_set_args,i18npool_test_breakiterator,\
+   --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
+))
 
 $(eval $(call gb_RdbTarget_RdbTarget,i18npool_test_breakiterator))
 
diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst
index 935e4c4d41e7..e95a27a46cbb 100644
--- a/i18npool/prj/build.lst
+++ b/i18npool/prj/build.lst
@@ -1,2 +1,2 @@
-inp  i18npool    :   bridges sax stoc comphelper CPPUNIT:cppunit ICU:icu i18nutil regexp DESKTOP:cpputools LIBXSLT:libxslt udkapi ure NULL
+inp  i18npool    :   bridges sax stoc comphelper CPPUNIT:cppunit ICU:icu i18nutil regexp DESKTOP:cpputools LIBXSLT:libxslt udkapi ure unotest NULL
 inp  i18npool\prj       nmake   -   all inp_prj NULL
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index dffd6f405db5..d6a8db249a9a 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -310,6 +310,7 @@ LPSOLVELIB=-llpsolve55
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
+UNOTESTLIB=-lunotest
 XMLREADERLIB=-lxmlreader
 
 .IF "$(OS)" == "IOS"
@@ -522,6 +523,7 @@ LPSOLVELIB=lpsolve55.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
 TESTLIB=itest.lib
+UNOTESTLIB=iunotest.lib
 BOOSTTHREADLIB=boostthread.lib
 XMLREADERLIB=ixmlreader.lib
 
diff --git a/test/prj/build.lst b/test/prj/build.lst
index 655170facea6..c99600b9d85a 100644
--- a/test/prj/build.lst
+++ b/test/prj/build.lst
@@ -1,6 +1,2 @@
-te test : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offapi ridljar sal solenv stlport unoil qadevOOo vcl NULL
-te test\inc nmake - all inc NULL
+te test : unotest vcl NULL
 te test\source\cpp nmake - all source_cpp inc NULL
-te test\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector inc NULL
-te test\source\java\org\openoffice\test nmake - all source_java NULL
-te test\source\java\org\openoffice\test\tools nmake - all source_java_tools NULL
diff --git a/test/prj/d.lst b/test/prj/d.lst
index bf4af6d239d7..326d6667eecf 100644
--- a/test/prj/d.lst
+++ b/test/prj/d.lst
@@ -1,19 +1,8 @@
 mkdir: %_DEST%\inc\test
-mkdir: %_DEST%\inc\test\detail
 ..\%__SRC%\bin\test.dll %_DEST%\bin\test.dll
-..\%__SRC%\bin\unoexceptionprotector.dll %_DEST%\bin\unoexceptionprotector.dll
 ..\%__SRC%\lib\itest.lib %_DEST%\lib\itest.lib
 ..\%__SRC%\lib\libtest.dylib %_DEST%\lib\libtest.dylib
 ..\%__SRC%\lib\libtest.so %_DEST%\lib\libtest.so
 ..\%__SRC%\lib\libtest.dll.a %_DEST%\lib\libtest.dll.a
-..\%__SRC%\lib\unoexceptionprotector.dylib %_DEST%\lib\unoexceptionprotector.dylib
-..\%__SRC%\lib\unoexceptionprotector.so %_DEST%\lib\unoexceptionprotector.so
 ..\inc\test\detail\testdllapi.hxx %_DEST%\inc\test\detail\testdllapi.hxx
-..\inc\test\gettestargument.hxx %_DEST%\inc\test\gettestargument.hxx
-..\inc\test\officeconnection.hxx %_DEST%\inc\test\officeconnection.hxx
 ..\inc\test\bootstrapfixture.hxx %_DEST%\inc\test\bootstrapfixture.hxx
-..\inc\test\oustringostreaminserter.hxx %_DEST%\inc\test\oustringostreaminserter.hxx
-..\inc\test\toabsolutefileurl.hxx %_DEST%\inc\test\toabsolutefileurl.hxx
-..\inc\test\uniquepipename.hxx %_DEST%\inc\test\uniquepipename.hxx
-..\%__SRC%\class\test.jar %_DEST%\bin\test.jar
-..\%__SRC%\class\test-tools.jar %_DEST%\bin\test-tools.jar
diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk
index 68bca023a58c..262326a6fc6d 100644
--- a/test/source/cpp/makefile.mk
+++ b/test/source/cpp/makefile.mk
@@ -38,12 +38,7 @@ CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 SLOFILES = \
-    $(SLO)/getargument.obj \
-    $(SLO)/gettestargument.obj \
-    $(SLO)/bootstrapfixture.obj \
-    $(SLO)/officeconnection.obj \
-    $(SLO)/toabsolutefileurl.obj \
-    $(SLO)/uniquepipename.obj
+    $(SLO)/bootstrapfixture.obj
 
 .IF "$(CROSS_COMPILING)" == "YES"
 SHL1IMPLIB = $(SHL1TARGET)
diff --git a/test/inc/pch/precompiled_test.hxx b/unotest/inc/unotest/detail/unotestdllapi.hxx
index 51067ed3d7dd..22adbdf040ad 100644
--- a/test/inc/pch/precompiled_test.hxx
+++ b/unotest/inc/unotest/detail/unotestdllapi.hxx
@@ -24,9 +24,17 @@
 * for a copy of the LGPLv3 License.
 ************************************************************************/
 
-#if defined PRECOMPILED_HEADERS
+#ifndef INCLUDED_UNOTEST_DETAIL_UNOTESTDLLAPI_HXX
+#define INCLUDED_UNOTEST_DETAIL_UNOTESTDLLAPI_HXX
 
 #include "sal/config.h"
+#include "sal/types.h"
+
+#if defined OOO_DLLIMPLEMENTATION_UNOTEST
+#define OOO_DLLPUBLIC_UNOTEST SAL_DLLPUBLIC_EXPORT
+#else
+#define OOO_DLLPUBLIC_UNOTEST SAL_DLLPUBLIC_IMPORT
+#endif
 
 #endif
 
diff --git a/unotest/inc/unotest/gettestargument.hxx b/unotest/inc/unotest/gettestargument.hxx
new file mode 100644
index 000000000000..4fe11147bc16
--- /dev/null
+++ b/unotest/inc/unotest/gettestargument.hxx
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+************************************************************************/
+
+#ifndef INCLUDED_TEST_GETTESTARGUMENT_HXX
+#define INCLUDED_TEST_GETTESTARGUMENT_HXX
+
+#include "sal/config.h"
+
+#include "test/detail/testdllapi.hxx"
+
+namespace rtl { class OUString; }
+
+namespace test {
+
+// Obtain the value of a test argument (tunneled in via an "arg-testarg.<name>"
+// bootstrap variable):
+OOO_DLLPUBLIC_TEST bool getTestArgument(
+    rtl::OUString const & name, rtl::OUString * value);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/inc/unotest/officeconnection.hxx b/unotest/inc/unotest/officeconnection.hxx
new file mode 100644
index 000000000000..e5250ce6aedf
--- /dev/null
+++ b/unotest/inc/unotest/officeconnection.hxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef INCLUDED_TEST_OFFICECONNECTION_HXX
+#define INCLUDED_TEST_OFFICECONNECTION_HXX
+
+#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "osl/process.h"
+#include "test/detail/testdllapi.hxx"
+
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
+namespace test {
+
+// Start up and shut down an OOo instance (details about the OOo instance are
+// tunneled in via "arg-..." bootstrap variables):
+class OOO_DLLPUBLIC_TEST OfficeConnection: private boost::noncopyable {
+public:
+    OfficeConnection();
+
+    ~OfficeConnection();
+
+    void setUp();
+
+    void tearDown();
+
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+    getComponentContext() const;
+
+    // Must not be called before setUp or after tearDown:
+    bool isStillAlive() const;
+
+private:
+    oslProcess process_;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+        context_;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/inc/unotest/oustringostreaminserter.hxx b/unotest/inc/unotest/oustringostreaminserter.hxx
new file mode 100644
index 000000000000..2658cad31d67
--- /dev/null
+++ b/unotest/inc/unotest/oustringostreaminserter.hxx
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef INCLUDED_TEST_OUSTRINGOSTREAMINSERTER_HXX
+#define INCLUDED_TEST_OUSTRINGOSTREAMINSERTER_HXX
+
+#include "sal/config.h"
+
+#include <ostream>
+
+#include "osl/thread.h"
+#include "rtl/ustring.hxx"
+
+// Include this header to support rtl::OUString in CPPUNIT_ASSERT macros.
+
+template< typename charT, typename traits > std::basic_ostream<charT, traits> &
+operator <<(
+    std::basic_ostream<charT, traits> & stream, rtl::OUString const & string)
+{
+    return stream <<
+        rtl::OUStringToOString(string, osl_getThreadTextEncoding()).getStr();
+        // best effort; potentially loses data due to conversion failures and
+        // embedded null characters
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/inc/unotest/toabsolutefileurl.hxx b/unotest/inc/unotest/toabsolutefileurl.hxx
new file mode 100644
index 000000000000..6548448b0356
--- /dev/null
+++ b/unotest/inc/unotest/toabsolutefileurl.hxx
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef INCLUDED_TEST_TOABSOLUTEFILEURL_HXX
+#define INCLUDED_TEST_TOABSOLUTEFILEURL_HXX
+
+#include "sal/config.h"
+
+#include "unotest/detail/unotestdllapi.hxx"
+
+namespace rtl { class OUString; }
+
+namespace test {
+
+// Convert a pathname in system notation, potentially relative to the process's
+// current working directory, to an absolute file URL:
+OOO_DLLPUBLIC_UNOTEST rtl::OUString toAbsoluteFileUrl(
+    rtl::OUString const & relativePathname);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/pch/precompiled_test.cxx b/unotest/inc/unotest/uniquepipename.hxx
index f08dea15c2ab..b66492ce271a 100644
--- a/test/inc/pch/precompiled_test.cxx
+++ b/unotest/inc/unotest/uniquepipename.hxx
@@ -1,5 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
+*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -22,8 +23,25 @@
 * version 3 along with OpenOffice.org.  If not, see
 * <http://www.openoffice.org/license.html>
 * for a copy of the LGPLv3 License.
+*
 ************************************************************************/
 
-#include "precompiled_test.hxx"
+#ifndef INCLUDED_TEST_UNIQUEPIPENAME_HXX
+#define INCLUDED_TEST_UNIQUEPIPENAME_HXX
+
+#include "sal/config.h"
+
+#include "test/detail/testdllapi.hxx"
+
+namespace rtl { class OUString; }
+
+namespace test {
+
+// Create a system-wide unique name (for use with osl::Pipe):
+OOO_DLLPUBLIC_TEST rtl::OUString uniquePipeName(rtl::OUString const & name);
+
+}
+
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/prj/build.lst b/unotest/prj/build.lst
new file mode 100644
index 000000000000..1bb6c713b23b
--- /dev/null
+++ b/unotest/prj/build.lst
@@ -0,0 +1,5 @@
+unote unotest : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offapi ridljar sal solenv stlport unoil qadevOOo vcl NULL
+unote unotest\source\cpp nmake - all source_cpp inc NULL
+unote unotest\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector inc NULL
+unote unotest\source\java\org\openoffice\test nmake - all source_java NULL
+unote unotest\source\java\org\openoffice\test\tools nmake - all source_java_tools NULL
diff --git a/unotest/prj/d.lst b/unotest/prj/d.lst
new file mode 100644
index 000000000000..af2c362474c3
--- /dev/null
+++ b/unotest/prj/d.lst
@@ -0,0 +1,18 @@
+mkdir: %_DEST%\inc\unotest
+mkdir: %_DEST%\inc\unotest\detail
+..\%__SRC%\bin\unotest.dll %_DEST%\bin\unotest.dll
+..\%__SRC%\bin\unoexceptionprotector.dll %_DEST%\bin\unoexceptionprotector.dll
+..\%__SRC%\lib\iunotest.lib %_DEST%\lib\iunotest.lib
+..\%__SRC%\lib\libunotest.dylib %_DEST%\lib\libunotest.dylib
+..\%__SRC%\lib\libunotest.so %_DEST%\lib\libunotest.so
+..\%__SRC%\lib\libunotest.dll.a %_DEST%\lib\libunotest.dll.a
+..\%__SRC%\lib\unoexceptionprotector.dylib %_DEST%\lib\unoexceptionprotector.dylib
+..\%__SRC%\lib\unoexceptionprotector.so %_DEST%\lib\unoexceptionprotector.so
+..\inc\unotest\detail\unotestdllapi.hxx %_DEST%\inc\unotest\detail\unotestdllapi.hxx
+..\inc\unotest\gettestargument.hxx %_DEST%\inc\unotest\gettestargument.hxx
+..\inc\unotest\officeconnection.hxx %_DEST%\inc\unotest\officeconnection.hxx
+..\inc\unotest\oustringostreaminserter.hxx %_DEST%\inc\unotest\oustringostreaminserter.hxx
+..\inc\unotest\toabsolutefileurl.hxx %_DEST%\inc\unotest\toabsolutefileurl.hxx
+..\inc\unotest\uniquepipename.hxx %_DEST%\inc\unotest\uniquepipename.hxx
+..\%__SRC%\class\test.jar %_DEST%\bin\test.jar
+..\%__SRC%\class\test-tools.jar %_DEST%\bin\test-tools.jar
diff --git a/test/source/cpp/getargument.cxx b/unotest/source/cpp/getargument.cxx
index d401bc964094..d401bc964094 100644
--- a/test/source/cpp/getargument.cxx
+++ b/unotest/source/cpp/getargument.cxx
diff --git a/test/source/cpp/getargument.hxx b/unotest/source/cpp/getargument.hxx
index 3380fdd2e5c2..3380fdd2e5c2 100644
--- a/test/source/cpp/getargument.hxx
+++ b/unotest/source/cpp/getargument.hxx
diff --git a/test/source/cpp/gettestargument.cxx b/unotest/source/cpp/gettestargument.cxx
index 0bc00062e8d3..0bc00062e8d3 100644
--- a/test/source/cpp/gettestargument.cxx
+++ b/unotest/source/cpp/gettestargument.cxx
diff --git a/test/inc/makefile.mk b/unotest/source/cpp/makefile.mk
index c8428466005b..31eafda84da9 100644
--- a/test/inc/makefile.mk
+++ b/unotest/source/cpp/makefile.mk
@@ -23,16 +23,47 @@
 # for a copy of the LGPLv3 License.
 #***********************************************************************/
 
-PRJ = ..
-PRJNAME = test
-TARGET = inc
+PRJ = ../..
+PRJNAME = unotest
+TARGET = cpp
 
 ENABLE_EXCEPTIONS = TRUE
 VISIBILITY_HIDDEN = TRUE
 
 .INCLUDE: settings.mk
-.INCLUDE: target.mk
 
-.IF "$(ENABLE_PCH)" != ""
-ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch
+# --- Files --------------------------------------------------------
+CDEFS += -DOOO_DLLIMPLEMENTATION_UNOTEST
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+SLOFILES = \
+    $(SLO)/getargument.obj \
+    $(SLO)/gettestargument.obj \
+    $(SLO)/bootstrapfixture.obj \
+    $(SLO)/officeconnection.obj \
+    $(SLO)/toabsolutefileurl.obj \
+    $(SLO)/uniquepipename.obj
+
+.IF "$(CROSS_COMPILING)" == "YES"
+SHL1IMPLIB = $(SHL1TARGET)
+.ELSE
+SHL1IMPLIB = i$(SHL1TARGET)
 .ENDIF
+SHL1OBJS = $(SLOFILES)
+SHL1RPATH = NONE
+SHL1STDLIBS = \
+    $(VCLLIB) \
+    $(TOOLSLIB) \
+    $(UCBHELPERLIB) \
+    $(COMPHELPERLIB) \
+    $(CPPUHELPERLIB) \
+    $(UNOTOOLSLIB) \
+    $(CPPULIB) \
+    $(CPPUNITLIB) \
+    $(SALLIB)
+SHL1TARGET = test
+SHL1USE_EXPORTS = name
+DEF1NAME = $(SHL1TARGET)
+
+.INCLUDE: target.mk
diff --git a/test/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx
index 9c8d4d549b71..9c8d4d549b71 100644
--- a/test/source/cpp/officeconnection.cxx
+++ b/unotest/source/cpp/officeconnection.cxx
diff --git a/test/source/cpp/toabsolutefileurl.cxx b/unotest/source/cpp/toabsolutefileurl.cxx
index e7c97d2fb85f..e7c97d2fb85f 100644
--- a/test/source/cpp/toabsolutefileurl.cxx
+++ b/unotest/source/cpp/toabsolutefileurl.cxx
diff --git a/test/source/cpp/uniquepipename.cxx b/unotest/source/cpp/uniquepipename.cxx
index 1725ca218918..1725ca218918 100644
--- a/test/source/cpp/uniquepipename.cxx
+++ b/unotest/source/cpp/uniquepipename.cxx
diff --git a/test/source/cpp/unoexceptionprotector/makefile.mk b/unotest/source/cpp/unoexceptionprotector/makefile.mk
index d3d13e646232..d3d13e646232 100644
--- a/test/source/cpp/unoexceptionprotector/makefile.mk
+++ b/unotest/source/cpp/unoexceptionprotector/makefile.mk
diff --git a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index 7e7e0000c49a..7e7e0000c49a 100644
--- a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
diff --git a/test/source/java/org/openoffice/test/Argument.java b/unotest/source/java/org/openoffice/test/Argument.java
index 0380375d8519..0380375d8519 100644
--- a/test/source/java/org/openoffice/test/Argument.java
+++ b/unotest/source/java/org/openoffice/test/Argument.java
diff --git a/test/source/java/org/openoffice/test/FileHelper.java b/unotest/source/java/org/openoffice/test/FileHelper.java
index 722b31124d43..722b31124d43 100644
--- a/test/source/java/org/openoffice/test/FileHelper.java
+++ b/unotest/source/java/org/openoffice/test/FileHelper.java
diff --git a/test/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index b05c34bc3996..b05c34bc3996 100644
--- a/test/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
diff --git a/test/source/java/org/openoffice/test/OfficeFileUrl.java b/unotest/source/java/org/openoffice/test/OfficeFileUrl.java
index 1ab62e283e6a..1ab62e283e6a 100644
--- a/test/source/java/org/openoffice/test/OfficeFileUrl.java
+++ b/unotest/source/java/org/openoffice/test/OfficeFileUrl.java
diff --git a/test/source/java/org/openoffice/test/TestArgument.java b/unotest/source/java/org/openoffice/test/TestArgument.java
index 1303d09e1ba2..1303d09e1ba2 100644
--- a/test/source/java/org/openoffice/test/TestArgument.java
+++ b/unotest/source/java/org/openoffice/test/TestArgument.java
diff --git a/test/source/java/org/openoffice/test/UnoApiTest.java b/unotest/source/java/org/openoffice/test/UnoApiTest.java
index fc5ba5a9c68f..fc5ba5a9c68f 100644
--- a/test/source/java/org/openoffice/test/UnoApiTest.java
+++ b/unotest/source/java/org/openoffice/test/UnoApiTest.java
diff --git a/test/source/java/org/openoffice/test/makefile.mk b/unotest/source/java/org/openoffice/test/makefile.mk
index 65b54d11da65..65b54d11da65 100644
--- a/test/source/java/org/openoffice/test/makefile.mk
+++ b/unotest/source/java/org/openoffice/test/makefile.mk
diff --git a/test/source/java/org/openoffice/test/tools/DocumentType.java b/unotest/source/java/org/openoffice/test/tools/DocumentType.java
index bf310c5ed0fa..bf310c5ed0fa 100644
--- a/test/source/java/org/openoffice/test/tools/DocumentType.java
+++ b/unotest/source/java/org/openoffice/test/tools/DocumentType.java
diff --git a/test/source/java/org/openoffice/test/tools/OfficeDocument.java b/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java
index bfb76a347e1c..bfb76a347e1c 100644
--- a/test/source/java/org/openoffice/test/tools/OfficeDocument.java
+++ b/unotest/source/java/org/openoffice/test/tools/OfficeDocument.java
diff --git a/test/source/java/org/openoffice/test/tools/OfficeDocumentView.java b/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java
index 9d5db59ac009..9d5db59ac009 100644
--- a/test/source/java/org/openoffice/test/tools/OfficeDocumentView.java
+++ b/unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java
diff --git a/test/source/java/org/openoffice/test/tools/SpreadsheetDocument.java b/unotest/source/java/org/openoffice/test/tools/SpreadsheetDocument.java
index 83b4028eec32..83b4028eec32 100644
--- a/test/source/java/org/openoffice/test/tools/SpreadsheetDocument.java
+++ b/unotest/source/java/org/openoffice/test/tools/SpreadsheetDocument.java
diff --git a/test/source/java/org/openoffice/test/tools/SpreadsheetView.java b/unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java
index 34cb8b0813e4..34cb8b0813e4 100644
--- a/test/source/java/org/openoffice/test/tools/SpreadsheetView.java
+++ b/unotest/source/java/org/openoffice/test/tools/SpreadsheetView.java
diff --git a/test/source/java/org/openoffice/test/tools/makefile.mk b/unotest/source/java/org/openoffice/test/tools/makefile.mk
index 1464bb958d49..1464bb958d49 100644
--- a/test/source/java/org/openoffice/test/tools/makefile.mk
+++ b/unotest/source/java/org/openoffice/test/tools/makefile.mk