Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Andrew Wilson
iMSTK
Commits
d58036aa
Commit
d58036aa
authored
Aug 04, 2021
by
Andrew Wilson
🐘
Browse files
Merge branch 'CDHRefactor' of
https://gitlab.kitware.com/andrew.wilson/iMSTK
into CDHRefactor
parents
52a44943
0186ac28
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
d58036aa
...
...
@@ -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
View file @
d58036aa
...
...
@@ -28,23 +28,24 @@
int
main
(
int
argc
,
char
**
argv
)
{
bool
removeLog
=
fals
e
;
bool
removeLog
=
tru
e
;
for
(
int
i
=
0
;
i
<
argc
;
++
i
)
{
if
(
std
::
string
(
argv
[
i
])
==
"--imstk_keep_log"
)
{
removeLog
=
tru
e
;
removeLog
=
fals
e
;
}
}
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"
,
"
test
log"
);
logger
.
addFileSink
(
"test"
,
"log"
);
::
testing
::
InitGoogleTest
(
&
argc
,
argv
);
return
RUN_ALL_TESTS
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment