Changeset 205:05a60bb012d3 in verona

Timestamp:

May 25, 2011 11:13:42 AM (2 years ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

avoid static object construction in phtests

Location:

phtest

Files:

• phtests_core.cpp (modified) (5 diffs)
• phtests_priv.h (modified) (1 diff)

phtest/phtests_core.cpp

@@ -208 +208 @@
 };
 
-myphapi testsphapi;
+myphapi *testsphapip;
 
 struct testsFunc
@@ -226 +226 @@
         funcTab = new testsFunc*[nbFunc];
         memset(funcTab, 0, nbFunc);
+        testsphapip = new myphapi;
 }
 
 phTestsCore::~phTestsCore()
 {
+        delete testsphapip;
+
         for (int i = 0; i < nbFunc && funcTab[i]; ++i)
                 delete funcTab[i];
@@ -298 +301 @@
 
         DBG_LOG("begin loop");
-        testsphapi.conf(conf);
+        testsphapip->conf(conf);
         //test nbloop == -1 for infinite loop
         //test (res || !conf->haltonerror) for halting if func return false
@@ -315 +318 @@
         return res;
 }
+#if 0
 #include <sstream>
 std::ostringstream funcPath;
@@ -322 +326 @@
 void phTestsCore::addToPath(int choosenFunc, int res) { funcPath << choosenFunc << "#" << res << ";";  }
 
+#else
+void phTestsCore::dumpPath() { }
+
+void phTestsCore::addToPath(int choosenFunc, int res) {   }
+
+
+
+
+#endif

phtest/phtests_priv.h

@@ -33 +33 @@
         void onCallProgress(int cid, const phCallStateInfo_t *info);
 };
-extern myphapi testsphapi;
+extern myphapi *testsphapip;
+#define testsphapi (*testsphapip)
+
 
 #endif /*! TESTS_PRIV_H*/