sb118: Replace (heavily modified) CppUnit 1.8.0 with (unmodified) latest 1.12.1.

- Old modifications were necessary for testshl2, which has simply been excluded
from the build for now.
- Tests in basebmp, basegfx, o3tl (that are executed during build) have been
converted from using modified CppUnit/testshl2 to using unmodified CppUnit.
- CppUnit's DllPlugInTester has problems with OOo tests on Windows, see
#i107562#, so for now a new cppunittester from sal is used instead.

4 files changed, 112 insertions, 1 deletions

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
new file mode 100644
index 000000000000..a8d36b312910
--- /dev/null
+++ b/sal/cppunittester/cppunittester.cxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2010 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.
+************************************************************************/
+
+#include "precompiled_sal.hxx"
+#include "sal/config.h"
+
+#include <cstdlib>
+#include <iostream>
+
+#include "cppunit/CompilerOutputter.h"
+#include "cppunit/TestResult.h"
+#include "cppunit/TestResultCollector.h"
+#include "cppunit/TestRunner.h"
+#include "cppunit/extensions/TestFactoryRegistry.h"
+#include "cppunit/plugin/PlugInManager.h"
+#include "cppunit/portability/Stream.h"
+#include "osl/thread.h"
+#include "rtl/process.h"
+#include "rtl/string.hxx"
+#include "rtl/ustring.hxx"
+#include "sal/main.h"
+
+SAL_IMPLEMENT_MAIN() {
+    if (rtl_getAppCommandArgCount() != 1) {
+        std::cerr << "Usage: cppunittest <shared-library-path>" << std::endl;
+        return EXIT_FAILURE;
+    }
+    rtl::OUString path;
+    rtl_getAppCommandArg(0, &path.pData);
+    CppUnit::PlugInManager manager;
+    manager.load(
+        rtl::OUStringToOString(path, osl_getThreadTextEncoding()).getStr());
+    CppUnit::TestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+    CppUnit::TestResult result;
+    CppUnit::TestResultCollector collector;
+    result.addListener(&collector);
+    runner.run(result);
+    CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
+    return collector.wasSuccessful() ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
new file mode 100644
index 000000000000..a87d1b182c68
--- /dev/null
+++ b/sal/cppunittester/makefile.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile,v $
+#
+# $Revision: 1.4 $
+#
+# 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.
+#***********************************************************************/
+
+PRJ = ..
+PRJNAME = sal
+TARGET = cppunittester
+
+ENABLE_EXCEPTIONS = TRUE
+
+.INCLUDE: settings.mk
+
+OBJFILES = $(APP1OBJS)
+
+APP1OBJS = $(OBJ)/cppunittester.obj
+APP1RPATH = NONE
+APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+APP1TARGET = cppunittester
+
+.INCLUDE: target.mk
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 5622d80edeef..6985584b63bb 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,4 +1,4 @@
-sa	sal	:	xml2cmp stlport external BOOST:boost NULL 
+sa	sal	:	xml2cmp stlport external BOOST:boost cppunit NULL 
 sa	sal										usr1	-	all	sa_mkout NULL
 sa	sal\inc									nmake	-	all	sa_inc NULL
 sa	sal\typesconfig							nmake	-	u	sa_tc sa_inc NULL
@@ -14,3 +14,4 @@ sa  sal\qa                                  nmake   -   all sa_qa sa_util NULL
 sa	sal\osl\unx								nmake	-	u	sa_oslu sa_tc.u sa_inc NULL
 sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u sa_inc NULL
 sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL
+sa sal\cppunittester nmake - all sa_cppunittester sa_util NULL
diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index bcd9c0e2c95a..3ce270bbbfc4 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -34,3 +34,5 @@ symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib
 
 ..\%__SRC%\inc\udkversion.h %_DEST%\inc%_EXT%\sal\udkversion.h
 
+..\%__SRC%\bin\cppunittester %_DEST%\bin%_EXT%\cppunittester
+..\%__SRC%\bin\cppunittester.exe %_DEST%\bin%_EXT%\cppunittester.exe