[Libreoffice-commits] .: sal/cppunittester

[Libreoffice Gerrit user]

 sal/cppunittester/cppunittester.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 1465fd6537b6b5bd8ee9b9414519a26fbc0b5621
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 22 08:29:07 2012 +0100

    Fail fast
    
    Change-Id: I17d6ab71ec7bcf40dccb2c9ffe3d9f2e6b10f01c

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 84e0e1e..e8584c1 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -120,7 +120,6 @@ public:
     }
     bool run() const
     {
-        bool bSuccess = false;
 #ifdef DISABLE_DYNLOADING
         // For iOS cppunit plugins aren't really "plugins" (shared
         // libraries), but just static archives. In the real main
@@ -128,14 +127,13 @@ public:
         // the SAL_IMPLEMENT_MAIN() below expands to, we specifically
         // call the initialize methods of the CppUnitTestPlugIns that
         // we statically link to the app executable.
-        bSuccess = true;
 #else
         CppUnit::PlugInManager manager;
         try {
             manager.load(testlib, args);
-            bSuccess = true;
         } catch (const CppUnit::DynamicLibraryManagerException &e) {
             std::cerr << "DynamicLibraryManagerException: \"" << e.what() << "\"\n";
+            return false;
         }
 #endif
         CppUnit::TestRunner runner;
@@ -158,7 +156,7 @@ public:
             result.popProtector();
 
         CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
-        return bSuccess && collector.wasSuccessful();
+        return collector.wasSuccessful();
     }
     virtual bool operator()() const
     {