From 9e13afeaf67b9c07762692cd858de4b577234ab7 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 3 Jun 2014 14:49:55 +0200
Subject: Cover ctors/dtors of our TestFixtures under the protectors, too

Change-Id: I4c3030e5a205bd102d0427e74d2fe3b828ff5ae6
---
 sal/cppunittester/cppunittester.cxx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'sal/cppunittester')

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 0c5a2a1a4f40..9c58b271b19d 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -217,8 +217,6 @@ public:
             return false;
         }
 #endif
-        CppUnit::TestRunner runner;
-        runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
 
         CppUnit::TestResultCollector collector;
         result.addListener(&collector);
@@ -238,7 +236,12 @@ public:
         for (size_t i = 0; i < protectors.size(); ++i)
             result.pushProtector(protectors[i]);
 
-        runner.run(result);
+        {
+            CppUnit::TestRunner runner;
+            runner.addTest(
+                CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+            runner.run(result);
+        }
 
         for (size_t i = 0; i < protectors.size(); ++i)
             result.popProtector();
@@ -310,6 +313,8 @@ SAL_IMPLEMENT_MAIN() {
             fn = (oslGenericFunction) unoexceptionprotector;
         else if (sym == "unobootstrapprotector")
             fn = (oslGenericFunction) unobootstrapprotector;
+        else if (sym == "vclbootstrapprotector")
+            fn = (oslGenericFunction) vclbootstrapprotector;
         else
         {
             std::cerr
-- 
cgit