Merge branch 'CDHRefactor' of https://gitlab.kitware.com/andrew.wilson/iMSTK into CDHRefactor

CMakeLists.txt

@@ -373,7 +373,10 @@ add_subdirectory(Source/CollisionDetection)
 add_subdirectory(Source/CollisionHandling)
 add_subdirectory(Source/Scene)
 add_subdirectory(Source/SimulationManager)
+<<<<<<< HEAD
 add_subdirectory(Source/Testing)
+=======
+>>>>>>> d1989b9d (REFAC: Remove apiutils)
 add_subdirectory(Source/Filtering)
 add_subdirectory(Source/FilteringCore)
 

Source/Testing/imstkTestingMain.cpp

@@ -28,23 +28,24 @@
 int
 main(int argc, char** argv)
 {
-    bool removeLog = false;
+    bool removeLog = true;
     for (int i = 0; i < argc; ++i)
     {
         if (std::string(argv[i]) == "--imstk_keep_log")
         {
-            removeLog = true;
+            removeLog = false;
         }
     }
 
     if (removeLog)
     {
-        vtksys::SystemTools::RemoveADirectory("testlog");
-        vtksys::SystemTools::MakeDirectory("testlog");
+        vtksys::SystemTools::RemoveADirectory("log");
     }
 
+    vtksys::SystemTools::MakeDirectory("log");
+
     auto& logger = imstk::Logger::getInstance();
-    logger.addFileSink("test", "testlog");
+    logger.addFileSink("test", "log");
 
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();