diff options
author | Stefan Radomski <github@mintwerk.de> | 2016-12-09 12:25:11 (GMT) |
---|---|---|
committer | Stefan Radomski <github@mintwerk.de> | 2016-12-09 12:25:11 (GMT) |
commit | 9b8e09c3fde755ec26e5c21b9640f53ed9329d05 (patch) | |
tree | c7001e5bfc551a24e3cee0b3fb014791e0685b44 /test/src | |
parent | 9fae96bbf295fcd867d60bf45d9c3b825ae692c2 (diff) | |
download | uscxml-9b8e09c3fde755ec26e5c21b9640f53ed9329d05.zip uscxml-9b8e09c3fde755ec26e5c21b9640f53ed9329d05.tar.gz uscxml-9b8e09c3fde755ec26e5c21b9640f53ed9329d05.tar.bz2 |
Removed easylogging due to JNI segfaults
Diffstat (limited to 'test/src')
-rw-r--r-- | test/src/test-lifecycle.cpp | 2 | ||||
-rw-r--r-- | test/src/test-snippets.cpp | 4 | ||||
-rw-r--r-- | test/src/test-state-pass.cpp | 4 | ||||
-rw-r--r-- | test/src/test-stress.cpp | 4 | ||||
-rw-r--r-- | test/src/test-url.cpp | 4 | ||||
-rw-r--r-- | test/src/test-validating.cpp | 4 |
6 files changed, 12 insertions, 10 deletions
diff --git a/test/src/test-lifecycle.cpp b/test/src/test-lifecycle.cpp index 55a524e..59ef1d8 100644 --- a/test/src/test-lifecycle.cpp +++ b/test/src/test-lifecycle.cpp @@ -1,7 +1,7 @@ #include "uscxml/config.h" #include "uscxml/Interpreter.h" #include "uscxml/interpreter/InterpreterMonitor.h" -#include <easylogging++.h> +#include "uscxml/interpreter/Logging.h" #include <boost/algorithm/string.hpp> #include <xercesc/util/PlatformUtils.hpp> diff --git a/test/src/test-snippets.cpp b/test/src/test-snippets.cpp index a9625b1..4b0fafe 100644 --- a/test/src/test-snippets.cpp +++ b/test/src/test-snippets.cpp @@ -7,6 +7,7 @@ #include "uscxml/config.h" #include "uscxml/Interpreter.h" +#include "uscxml/interpreter/LoggingImpl.h" using namespace uscxml; @@ -31,5 +32,6 @@ void microstep_snippet() { } int main(int argc, char** argv) { + Logger::getDefault().log(USCXML_FATAL) << "Foo!" << " BAR?"; microstep_snippet(); -}
\ No newline at end of file +} diff --git a/test/src/test-state-pass.cpp b/test/src/test-state-pass.cpp index 163e5b9..33f13ac 100644 --- a/test/src/test-state-pass.cpp +++ b/test/src/test-state-pass.cpp @@ -14,7 +14,7 @@ #include "uscxml/util/Predicates.h" #include "uscxml/util/Convenience.h" // iequals -#include "easylogging++.h" +#include "uscxml/interpreter/Logging.h" #include "uscxml/messages/Event.h" #include "uscxml/server/HTTPServer.h" @@ -43,7 +43,7 @@ int main(int argc, char** argv) { size_t iterations = 1; std::string documentURI; - el::Loggers::reconfigureAllLoggers(el::ConfigurationType::Format, "%datetime %level %fbase:%line: %msg"); +// el::Loggers::reconfigureAllLoggers(el::ConfigurationType::Format, "%datetime %level %fbase:%line: %msg"); if (argc < 2) { exit(EXIT_FAILURE); diff --git a/test/src/test-stress.cpp b/test/src/test-stress.cpp index d3209e2..6312ae4 100644 --- a/test/src/test-stress.cpp +++ b/test/src/test-stress.cpp @@ -3,7 +3,7 @@ //#include "uscxml/Factory.h" #include "uscxml/server/HTTPServer.h" -#include <easylogging++.h> +#include "uscxml/interpreter/Logging.h" #include "uscxml/plugins/invoker/dirmon/DirMonInvoker.h" #include <boost/algorithm/string.hpp> @@ -106,4 +106,4 @@ int main(int argc, char** argv) { delete watcher; return EXIT_SUCCESS; -}
\ No newline at end of file +} diff --git a/test/src/test-url.cpp b/test/src/test-url.cpp index 0e1d115..3d46c03 100644 --- a/test/src/test-url.cpp +++ b/test/src/test-url.cpp @@ -5,7 +5,7 @@ #include "uscxml/config.h"
#include <xercesc/parsers/XercesDOMParser.hpp>
-#include <easylogging++.h>
+#include "uscxml/interpreter/Logging.h"
#include <assert.h>
#include <iostream>
@@ -295,4 +295,4 @@ int main(int argc, char** argv) { assert(iequals(url.scheme(), "file"));
}
#endif
-}
\ No newline at end of file +}
diff --git a/test/src/test-validating.cpp b/test/src/test-validating.cpp index 609ac42..fa660b9 100644 --- a/test/src/test-validating.cpp +++ b/test/src/test-validating.cpp @@ -2,7 +2,7 @@ #include "uscxml/Interpreter.h" #include "uscxml/interpreter/InterpreterImpl.h" #include "uscxml/debug/InterpreterIssue.h" -#include <easylogging++.h> +#include "uscxml/interpreter/Logging.h" #include <xercesc/util/PlatformUtils.hpp> using namespace uscxml; @@ -815,4 +815,4 @@ int main(int argc, char** argv) { } return EXIT_SUCCESS; -}
\ No newline at end of file +} |