9 files changed, 129 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk
index be80170315d2..416c08050978 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     icuuc \
+    cppunit \
 ))
 
 
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 9a0c0aadf9bf..d796da5f86d4 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -28,7 +28,7 @@
 
 # Library class
 
-# defined globally in gbuild.mk
+# defined globally in TargetLocations.mk
 #  gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib
 #  gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library
 # defined by platform
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 03ff66523835..41f30e479acf 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -65,6 +65,7 @@ gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1)
 gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
 gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
 gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
+gb_TestFixture_get_target = $(WORKDIR)/TestFixture/$(1).test
 
 define gb_Library_get_external_headers_target
 $(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
@@ -93,6 +94,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
     ResTarget \
     SdiTarget \
     SrsTarget \
+    TestFixture \
 ))
 
 $(eval $(call gb_Helper_make_outdir_clean_targets,\
@@ -118,6 +120,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
 
 gb_Library_get_linktargetname = Library/$(1)
 gb_StaticLibrary_get_linktargetname = StaticLibrary/$(1)
+gb_TestFixure_get_linktargetname = TestFixture/$(1)
 
 define gb_Library_get_layer
 $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER)))
diff --git a/solenv/gbuild/TestFixure.mk b/solenv/gbuild/TestFixure.mk
new file mode 100644
index 000000000000..7c183eee04eb
--- /dev/null
+++ b/solenv/gbuild/TestFixure.mk
@@ -0,0 +1,92 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+
+# TestFixture class
+
+# defined globally in TargetLocations.mk
+#  gb_TestFixure_get_linktargetname
+# defined by platform
+#  gb_TestFixure_TARGETTYPEFLAGS
+#  gb_TestFixure_get_filename
+gb_TestFixture_CPPTESTTARGET := $(call gb_Executable_get_target,cppunittester)
+gb_TestFixture_CPPTESTCOMMAND := $(gb_TestFixture_CPPTESTPRECOMMAND) $(gb_TestFixture_CPPTESTTARGET)
+
+.PHONY : $(call gb_TestFixure_get_clean_target,%)
+$(call gb_TestFixure_get_clean_target,%) : $(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,%))
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $@)
+
+$(call gb_TestFixure_get_target,%) : $(gb_TestFixture_CPPTESTTARGET)
+    $(call gb_Helper_abbreviate_dirs_native,\
+        $(gb_TestFixture_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,$(call gb_TestFixure_get_linktargetname,$*)) > $@)
+
+define gb_TestFixure_TestFixure
+$(call gb_TestFixure__TestFixure_impl,$(1),$(call gb_TestFixure_get_linktargetname,$(call gb_TestFixure_get_filename,$(1))))
+
+endef
+
+define gb_TestFixure__TestFixure_impl
+$(call gb_LinkTarget_LinkTarget,$(2))
+$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_TestFixure_TARGETTYPEFLAGS))
+$(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
+$(call gb_TestFixure_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$$(eval $$(call gb_Module_register_target,$(call gb_TestFixure_get_target,$(1)),$(call gb_TestFixure_get_clean_target,$(1))))
+
+endef
+
+define gb_TestFixure__forward_to_Linktarget
+gb_TestFixure_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_TestFixure_get_linktargetname,$$(call gb_TestFixure_get_filename,$$(1))),$$(2),$$(3))
+
+endef
+
+$(eval $(foreach method,\
+    add_cobject \
+    add_cobjects \
+    add_cxxobject \
+    add_cxxobjects \
+    add_objcxxobject \
+    add_objcxxobjects \
+    add_exception_objects \
+    add_noexception_objects \
+    set_cflags \
+    set_cxxflags \
+    set_objcxxflags \
+    set_defs \
+    set_include \
+    set_ldflags \
+    set_library_path_flags \
+    add_linked_libs \
+    add_linked_static_libs \
+    add_package_headers \
+    add_sdi_headers \
+    add_precompiled_header \
+,\
+    $(call gb_TestFixure__forward_to_Linktarget,$(method))\
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 193ca6d3bab3..be9c46f056f5 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -201,6 +201,7 @@ include $(foreach class, \
     SdiTarget \
     Package \
     PrecompiledHeaders \
+    TestFixture \
     Module \
 ,$(GBUILDDIR)/$(class).mk)
 
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 147dbbac965f..2deeaa53d7da 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -307,11 +307,18 @@ define gb_Executable_get_rpath
 -Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
 endef
 
+# TestFixture class
+
+gb_TestFixure_TARGETTYPEFLAGS := $(gb_Library_TARGETTYPEFLAGS)
+gb_TestFixure_CPPTESTPRECOMMAND :=
+gb_TestFixure_SYSPRE := libtest_
+gb_TestFixure_EXT := .so
+gb_TestFixure_get_filename = $(gb_TestFixure_SYSPRE)$(1)$(gb_TestFixure_EXT)
+
 # SdiTarget class
 
 gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
 
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3786ae8d87d7..846aadb118c8 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -358,6 +358,13 @@ gb_Executable_LAYER := \
     $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
     $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
 
+# TestFixture class
+
+gb_TestFixure_TARGETTYPEFLAGS := $(gb_Library_TARGETTYPEFLAGS)
+gb_TestFixure_CPPTESTPRECOMMAND :=
+gb_TestFixure_SYSPRE := libtest_
+gb_TestFixure_EXT := .dylib
+gb_TestFixure_get_filename = $(gb_TestFixure_SYSPRE)$(1)$(gb_TestFixure_EXT)
 
 # SdiTarget class
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index d83fd4e6fe4d..412cbe325c8e 100755
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -289,6 +289,14 @@ gb_Executable_LAYER := \
     $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
 
 
+# TestFixture class
+
+gb_TestFixure_TARGETTYPEFLAGS := $(gb_Library_TARGETTYPEFLAGS)
+gb_TestFixure_CPPTESTPRECOMMAND :=
+gb_TestFixure_SYSPRE := libtest_
+gb_TestFixure_EXT := .so
+gb_TestFixure_get_filename = $(gb_TestFixure_SYSPRE)$(1)$(gb_TestFixure_EXT)
+
 # SdiTarget class
 
 gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 0752e7c065a8..9af96791bd92 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -524,6 +524,14 @@ $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable
 
 endef
 
+# TestFixture class
+
+gb_TestFixure_TARGETTYPEFLAGS := $(gb_Library_TARGETTYPEFLAGS)
+gb_TestFixure_CPPTESTPRECOMMAND :=
+gb_TestFixure_SYSPRE := itest_
+gb_TestFixure_EXT := .lib
+gb_TestFixure_get_filename = $(gb_TestFixure_SYSPRE)$(1)$(gb_TestFixure_EXT)
+
 # SdiTarget class
 
 gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"