[Libreoffice-commits] .: 2 commits - bridges/source cppu/qa sal/qa
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Aug 1 09:20:36 PDT 2012
bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 8 -
cppu/qa/cppu_cppunittester_all.cxx | 140 ----------------------
cppu/qa/test_any.cxx | 4
cppu/qa/test_recursion.cxx | 4
cppu/qa/test_reference.cxx | 4
cppu/qa/test_unotype.cxx | 4
sal/qa/osl/file/osl_File.cxx | 4
sal/qa/osl/file/osl_old_test_file.cxx | 4
sal/qa/osl/file/test_cpy_wrt_file.cxx | 4
sal/qa/osl/process/osl_Thread.cxx | 4
sal/qa/static/makefile.mk | 68 ----------
sal/qa/static/sal_cppunittester_all.cxx | 159 -------------------------
12 files changed, 6 insertions(+), 401 deletions(-)
New commits:
commit 55a8ae6cf6dc67085b78dd213d174ede69a788d5
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Aug 1 19:14:02 2012 +0300
WaE: unused variable
Change-Id: I75e195be6bcedc972bc7c820c8c8efb648c91526
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index eba5d13..6f78313 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -157,7 +157,9 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
{
pair< t_rtti_map::iterator, bool > insertion(
m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
- OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
+ SAL_WARN_IF( !insertion.second,
+ "bridges",
+ "inserting new rtti failed" );
}
else
{
@@ -188,7 +190,9 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
pair< t_rtti_map::iterator, bool > insertion(
m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
- OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
+ SAL_WARN_IF( !insertion.second,
+ "bridges",
+ "inserting new generated rtti failed" );
}
else // taking already generated rtti
{
commit 850d9be56d50a1b143d6afe679808723d6164e21
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Aug 1 19:01:00 2012 +0300
Bin no longer used iOS cppunit stuff that breaks build even
Change-Id: I78c71b22816834c66c8283e3d85e357b7b8d2836
diff --git a/cppu/qa/cppu_cppunittester_all.cxx b/cppu/qa/cppu_cppunittester_all.cxx
deleted file mode 100644
index 49f1756..0000000
--- a/cppu/qa/cppu_cppunittester_all.cxx
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
- */
-
-#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 "cppunit/plugin/DynamicLibraryManagerException.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
- {
- bool bSuccess = false;
- try {
- CppUnit::TestRunner runner;
- runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- CppUnit::TestResultCollector collector;
- result.addListener(&collector);
- runner.run(result);
- CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
- bSuccess = collector.wasSuccessful();
- } catch( CppUnit::DynamicLibraryManagerException& e) {
- std::cerr << "DynamicLibraryManagerException: \"" << e.what() << "\"\n";
- }
- return bSuccess;
- }
- virtual bool operator()() const
- {
- return run();
- }
-};
-}
-
-extern "C" CppUnitTestPlugIn
- *cppunitTest_qa_cppu_any(void),
- *cppunitTest_qa_cppu_unotype(void),
- *cppunitTest_qa_cppu_reference(void),
- *cppunitTest_qa_cppu_recursion(void);
-
-
-SAL_IMPLEMENT_MAIN() {
- TestPlugInSignature plugs[] = {
- cppunitTest_qa_cppu_any,
- cppunitTest_qa_cppu_unotype,
- cppunitTest_qa_cppu_reference,
- cppunitTest_qa_cppu_recursion,
- 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: */
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 6c8aee0..3bb86f6 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -19,10 +19,6 @@
#include <sal/types.h>
-#ifdef IOS
-#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_any
-#endif
-
#include <stdlib.h> // wntmsci10 does not like <cstdlib>
#include <cppunit/TestSuite.h>
diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx
index 81e8c60..ab390fa 100644
--- a/cppu/qa/test_recursion.cxx
+++ b/cppu/qa/test_recursion.cxx
@@ -19,10 +19,6 @@
#include <sal/types.h>
-#ifdef IOS
-#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_recursion
-#endif
-
#include <cppunit/TestSuite.h>
#include <cppunit/TestFixture.h>
#include <cppunit/TestCase.h>
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index 12173c3..6fc2cfe 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -19,10 +19,6 @@
#include <sal/types.h>
-#ifdef IOS
-#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_reference
-#endif
-
#include <cppunit/TestSuite.h>
#include <cppunit/TestFixture.h>
#include <cppunit/TestCase.h>
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index a7e545d..0b370d7 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -19,10 +19,6 @@
#include <sal/types.h>
-#ifdef IOS
-#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_unotype
-#endif
-
#include <cppunit/TestSuite.h>
#include <cppunit/TestFixture.h>
#include <cppunit/TestCase.h>
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index b50735d..2b323e9 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-#ifdef IOS
-#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_osl_File
-#endif
-
//------------------------------------------------------------------------
// include files
//------------------------------------------------------------------------
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx
index 923fd4d..1cdb283 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-#ifdef IOS
-#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_old_test_file
-#endif
-
// LLA:
// this file is converted to use with testshl2
// original was placed in sal/test/textenc.cxx
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index bd38cbe..0b244d1 100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-#ifdef IOS
-#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_tcwf
-#endif
-
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index f1262b3..3cdbd48 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-#ifdef IOS
-#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_Thread
-#endif
-
#ifdef WNT
#if defined _MSC_VER
#define NOMINMAX
diff --git a/sal/qa/static/makefile.mk b/sal/qa/static/makefile.mk
deleted file mode 100644
index 71c3085..0000000
--- a/sal/qa/static/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#***********************************************************************/
-
-PRJ = ../..
-PRJNAME = sal
-TARGET = sal_cppunittester_all
-
-ENABLE_EXCEPTIONS = TRUE
-LIBTARGET = NO
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-.IF "$(OS)" != "IOS"
-
-ALL :
- @echo This is only for iOS
-
-.ENDIF
-
-CFLAGSCXX += -x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
-
-OBJFILES = $(APP1OBJS)
-
-APP1OBJS = $(OBJ)/sal_cppunittester_all.obj
-APP1RPATH = NONE
-APP1LIBS += \
- $(SLB)/qa_ByteSequence.lib \
- $(SLB)/qa_ostringbuffer.lib \
- $(SLB)/qa_osl_condition.lib \
- $(SLB)/qa_osl_file.lib \
- $(SLB)/qa_osl_security.lib \
- $(SLB)/qa_rtl_alloc.lib \
- $(SLB)/qa_rtl_cipher.lib \
- $(SLB)/qa_rtl_crc32.lib \
- $(SLB)/qa_rtl_doublelock.lib \
- $(SLB)/qa_rtl_locale.lib \
- $(SLB)/qa_sal.lib
-
-APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
-APP1TARGET = $(TARGET)
-
-.INCLUDE: target.mk
diff --git a/sal/qa/static/sal_cppunittester_all.cxx b/sal/qa/static/sal_cppunittester_all.cxx
deleted file mode 100644
index 35f9c4e..0000000
--- a/sal/qa/static/sal_cppunittester_all.cxx
+++ /dev/null
@@ -1,159 +0,0 @@
-/* -*- 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 <cstdlib>
-#include <iostream>
-#include <limits>
-#include <string>
-#include <sal/types.h>
-#include "cppunittester/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_qa_ByteSequence(void),
- *cppunitTest_qa_ostringbuffer(void),
- *cppunitTest_qa_osl_condition(void),
- *cppunitTest_qa_osl_File(void),
- *cppunitTest_tcwf(void),
- *cppunitTest_osl_old_test_file(void),
- *cppunitTest_qa_osl_security(void),
- *cppunitTest_qa_rtl_alloc(void),
- *cppunitTest_qa_rtl_cipher(void),
- *cppunitTest_qa_rtl_crc32(void),
- *cppunitTest_qa_rtl_doublelock(void),
- *cppunitTest_qa_rtl_locale(void),
- *cppunitTest_qa_sal(void);
-
-SAL_IMPLEMENT_MAIN() {
- TestPlugInSignature plugs[] = {
- cppunitTest_qa_ByteSequence,
- cppunitTest_qa_ostringbuffer,
- cppunitTest_qa_osl_condition,
- cppunitTest_qa_osl_File,
- cppunitTest_tcwf,
- cppunitTest_osl_old_test_file,
- cppunitTest_qa_osl_security,
- cppunitTest_qa_rtl_alloc,
- cppunitTest_qa_rtl_cipher,
- cppunitTest_qa_rtl_crc32,
- cppunitTest_qa_rtl_doublelock,
- cppunitTest_qa_rtl_locale,
- cppunitTest_qa_sal,
- 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: */
More information about the Libreoffice-commits
mailing list