Changeset 736

Timestamp:

11/24/09 17:26:50 (14 years ago)

Author:

mido

Message:

a small improvement of TestRunner?, now cleaning enviroment for each test - but it did not help, merger_2d_stress (and others) is stil running improperly

Location:

library/tests/unittest-cpp

Files:

• CMakeLists.txt (modified) (1 diff)
• TestRunner.cpp (modified) (2 diffs)
• TestRunner.h (modified) (2 diffs)

library/tests/unittest-cpp/CMakeLists.txt

@@ -12 +12 @@
 add_library(unittest ${unittest_src})
 
+target_link_libraries(unittest  bdm)
+
+
 # From CMake version 2.8, it is not allowed to add subdirectories without 
 # their CMakeLists, therfore the following two lines were commented out:

library/tests/unittest-cpp/TestRunner.cpp

@@ -5 +5 @@
 #include "TimeHelpers.h"
 #include "MemoryOutStream.h"
+
+
+#include "../bdm/base/bdmbase.h"
 
 #include <cstring>
@@ -67 +70 @@
 }
 
+void TestRunner::ClearEnvironment() const {
+        bdm::RV::clear_all();   
 }
+
+}

library/tests/unittest-cpp/TestRunner.h

@@ -32 +32 @@
                 while ( curTest != 0 ) {
                         if ( IsTestInSuite ( curTest, suiteName ) && predicate ( curTest ) )
+                        {
+                                ClearEnvironment();
                                 RunTest ( m_result, curTest, maxTestTimeInMs );
+                        }
+
 
                         curTest = curTest->next;
@@ -47 +51 @@
         int Finish() const;
         bool IsTestInSuite ( const Test* const curTest, char const* suiteName ) const;
-        void RunTest ( TestResults* const result, Test* const curTest, int const maxTestTimeInMs ) const;
+        void RunTest ( TestResults* const result, Test* const curTest, int const maxTestTimeInMs ) const;       
+        void ClearEnvironment() const;
 };