Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3B66A9616 for ; Fri, 23 Sep 2011 15:20:21 +0000 (UTC) Received: (qmail 57522 invoked by uid 500); 23 Sep 2011 15:20:20 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 57505 invoked by uid 500); 23 Sep 2011 15:20:20 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 57497 invoked by uid 99); 23 Sep 2011 15:20:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Sep 2011 15:20:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Sep 2011 15:20:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3D50823888E4; Fri, 23 Sep 2011 15:19:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1174831 - /incubator/ooo/trunk/main/sal/cppunittester/cppunittester.cxx Date: Fri, 23 Sep 2011 15:19:57 -0000 To: ooo-commits@incubator.apache.org From: hdu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110923151957.3D50823888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hdu Date: Fri Sep 23 15:19:56 2011 New Revision: 1174831 URL: http://svn.apache.org/viewvc?rev=1174831&view=rev Log: make exceptions for cppunittester verbose Modified: incubator/ooo/trunk/main/sal/cppunittester/cppunittester.cxx Modified: incubator/ooo/trunk/main/sal/cppunittester/cppunittester.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/cppunittester/cppunittester.cxx?rev=1174831&r1=1174830&r2=1174831&view=diff ============================================================================== --- incubator/ooo/trunk/main/sal/cppunittester/cppunittester.cxx (original) +++ incubator/ooo/trunk/main/sal/cppunittester/cppunittester.cxx Fri Sep 23 15:19:56 2011 @@ -53,6 +53,7 @@ #include "cppunit/extensions/TestFactoryRegistry.h" #include "cppunit/plugin/PlugInManager.h" #include "cppunit/portability/Stream.h" +#include "cppunit/plugin/DynamicLibraryManagerException.h" #include "postextstl.h" namespace { @@ -131,13 +132,21 @@ SAL_IMPLEMENT_MAIN() { if (rtl_getAppCommandArgCount() - index != 1) { usageFailure(); } - CppUnit::PlugInManager manager; - manager.load(convertStrict(getArgument(index))); - 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() ? EXIT_SUCCESS : EXIT_FAILURE; + + bool bSuccess = false; + try { + CppUnit::PlugInManager manager; + manager.load(convertStrict(getArgument(index))); + 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 ? EXIT_SUCCESS : EXIT_FAILURE; }