An update will be applied December 9th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit d58036aa authored by Andrew Wilson's avatar Andrew Wilson
Browse files

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

parents 52a44943 0186ac28
......@@ -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)
......
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment