Commit 96be43ff authored by Aaron Bray's avatar Aaron Bray
Browse files

Merge branch '2.x' into feature/respiratory_disease

parents baab7b3d 6f29af91
......@@ -46,13 +46,20 @@ if(NOT WIN32)
string(REPLACE ";" ":" JAVA_CLASSPATH "${JAVA_CLASSPATH}")
endif()
if(TYPE STREQUAL "SystemValidation")
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.SETestDriver SystemVerification.config)
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.validation.SystemValidation )
elseif(TYPE STREQUAL "PatientValidation")
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.SETestDriver PatientVerification.config)
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.validation.PatientValidation)
if(TYPE STREQUAL "tests" OR TYPE STREQUAL "SystemValidation" OR TYPE STREQUAL "PatientValidation")
if(TYPE STREQUAL "tests")
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.SETestDriver CDMUnitTests.config)
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.SETestDriver EngineUnitTests.config)
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.SETestDriver ScenarioVerification.config)
endif()
if(TYPE STREQUAL "SystemValidation" OR TYPE STREQUAL "tests")
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.SETestDriver SystemVerification.config)
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.validation.SystemValidation )
endif()
if(TYPE STREQUAL "PatientValidation" OR TYPE STREQUAL "tests")
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.SETestDriver PatientVerification.config)
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.testing.validation.PatientValidation)
endif()
elseif(TYPE STREQUAL "genData")
execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -Xmx900m -classpath "${JAVA_CLASSPATH}" com.kitware.physiology.pulse.dataset.DataSetReader)
elseif(TYPE STREQUAL "genStates")
......
......@@ -22,7 +22,7 @@ public:
bool log(Logger::level requested_level)
{
if (_log_level < requested_level)
if (requested_level < _log_level)
return false;
if (!_log_to_console && !_log_to_file)
return false;
......
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