Use separate unit testers for subsequent and normal tests for iOS

cppuhelper/qa/ifcontainer/makefile.mk

@@ -41,8 +41,6 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
 CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
 .ENDIF
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/cppu_ifcontainer.obj
 SHL1TARGET= cppu_ifcontainer
@@ -54,8 +52,8 @@ SHL1STDLIBS=\
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP= export.map
-# auto generated Target:joblist
+
-# END ------------------------------------------------------------------
+SLOFILES = $(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 

cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx

@@ -113,12 +113,13 @@ public:
 }
 
 extern "C" CppUnitTestPlugIn
-            *cppunitTest_cppuhelper_propertysetmixin(void);
+           *cppunitTest_cppu_ifcontainer(void),
-
+           *cppunitTest_cppu_unourl(void);
 
 SAL_IMPLEMENT_MAIN() {
     TestPlugInSignature plugs[] = {
-        cppunitTest_cppuhelper_propertysetmixin,
+        cppunitTest_cppu_ifcontainer,
+        cppunitTest_cppu_unourl,
         NULL
     };
     CppUnit::TestResult result;

cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx

@@ -0,0 +1,138 @@
+/* -*- 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.
+*
+************************************************************************/
+
+#include "sal/config.h"
+
+#include <cstdlib>
+#include <iostream>
+#include <limits>
+#include <string>
+#include "protectorfactory.hxx"
+#include "osl/module.h"
+#include "osl/module.hxx"
+#include "osl/thread.h"
+#include "rtl/process.h"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/textcvt.h"
+#include "rtl/ustring.hxx"
+#include "sal/main.h"
+#include "sal/types.h"
+
+#include "cppunit/CompilerOutputter.h"
+#include "cppunit/TestResult.h"
+#include "cppunit/TestResultCollector.h"
+#include "cppunit/TestRunner.h"
+#include "cppunit/plugin/TestPlugIn.h"
+#include "cppunit/plugin/PlugInParameters.h"
+#include "cppunit/extensions/TestFactoryRegistry.h"
+#include "cppunit/portability/Stream.h"
+
+#include "boost/noncopyable.hpp"
+
+namespace {
+
+void usageFailure() {
+    std::cerr
+        << ("Usage: cppunittester (--protector <shared-library-path>"
+            " <function-symbol>)* <shared-library-path>")
+        << std::endl;
+    std::exit(EXIT_FAILURE);
+}
+
+rtl::OUString getArgument(sal_Int32 index) {
+    rtl::OUString arg;
+    rtl_getAppCommandArg(index, &arg.pData);
+    return arg;
+}
+
+std::string convertLazy(rtl::OUString const & s16) {
+    rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding()));
+    return std::string(
+        s8.getStr(),
+        ((static_cast< sal_uInt32 >(s8.getLength())
+          > (std::numeric_limits< std::string::size_type >::max)())
+         ? (std::numeric_limits< std::string::size_type >::max)()
+         : static_cast< std::string::size_type >(s8.getLength())));
+}
+
+//Allow the whole uniting testing framework to be run inside a "Protector"
+//which knows about uno exceptions, so it can print the content of the
+//exception before falling over and dying
+class CPPUNIT_API ProtectedFixtureFunctor : public CppUnit::Functor, private boost::noncopyable
+{
+private:
+    const std::string &args;
+    CppUnit::TestResult &result;
+public:
+    ProtectedFixtureFunctor(const std::string &args_, CppUnit::TestResult &result_)
+        : args(args_)
+        , result(result_)
+    {
+    }
+    bool run() const
+    {
+        CppUnit::TestRunner runner;
+        runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+        CppUnit::TestResultCollector collector;
+        result.addListener(&collector);
+        runner.run(result);
+        CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
+        return collector.wasSuccessful();
+    }
+    virtual bool operator()() const
+    {
+        return run();
+    }
+};
+}
+
+extern "C" CppUnitTestPlugIn
+            *cppunitTest_cppuhelper_propertysetmixin(void);
+
+
+SAL_IMPLEMENT_MAIN() {
+    TestPlugInSignature plugs[] = {
+        cppunitTest_cppuhelper_propertysetmixin,
+        NULL
+    };
+    CppUnit::TestResult result;
+    std::string args;
+    bool ok = false;
+    for (TestPlugInSignature *plug = plugs; *plug != NULL; plug++) {
+        CppUnitTestPlugIn *iface;
+        iface = (*plug)();
+        iface->initialize(&CppUnit::TestFactoryRegistry::getRegistry(), CppUnit::PlugInParameters());
+    }
+    ProtectedFixtureFunctor tests(args, result);
+    ok = tests.run();
+
+    return ok ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cppuhelper/qa/static/makefile.mk

@@ -25,10 +25,6 @@
 #
 #***********************************************************************/
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
 PRJ = ../..
 PRJNAME = cppuhelper
 TARGET = cppuhelper_cppunittester_all
@@ -49,9 +45,9 @@ ALL :
 
 CFLAGSCXX += $(OBJCXXFLAGS)
 
-OBJFILES = $(APP1OBJS)
+.IF "$(OOO_SUBSEQUENT_TESTS)" != ""
 
-APP1OBJS = $(OBJ)/cppuhelper_cppunittester_all.obj
+APP1OBJS = $(OBJ)/cppuhelper_cppunittester_subsequent.obj
 APP1RPATH = NONE
 APP1LIBS += \
     $(SLB)/qa_propertysetmixin.lib \
@@ -60,6 +56,18 @@ APP1LIBS += \
 APP1STDLIBS = $(CPPUNITLIB) $(CPPULIB) $(SALLIB) $(SALHELPERLIB)
 APP1TARGET = $(TARGET)
 
-.INCLUDE: target.mk
+.ELSE
+
+APP1OBJS = $(OBJ)/cppuhelper_cppunittester_all.obj
+APP1RPATH = NONE
+APP1LIBS += \
+    $(SLB)/cppu_ifcontainer.lib \
+    $(SLB)/cppu_unourl.lib \
+    $(SLB)/cppuhelper.lib
+
+APP1STDLIBS = $(CPPUNITLIB) $(CPPULIB) $(SALLIB) $(SALHELPERLIB)
+APP1TARGET = $(TARGET)
 
 .ENDIF
+
+.INCLUDE: target.mk

cppuhelper/qa/unourl/makefile.mk

@@ -37,8 +37,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
+.IF "$(OS)" == "IOS"
-# auto generated Target:joblist by codegen.pl
+CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
+.ENDIF
+
 SHL1OBJS=  \
     $(SLO)$/cppu_unourl.obj
 SHL1TARGET= cppu_unourl
@@ -50,8 +52,8 @@ SHL1STDLIBS=\
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP= export.map
-# auto generated Target:joblist
+
-# END ------------------------------------------------------------------
+SLOFILES = $(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------