From 7756c80d63d3c21c4f4344e731d276d7df475152 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sat, 22 Dec 2018 13:44:43 -0700 Subject: [PATCH 01/19] try changing test output to TRACE --- examples/Fixture.cpp | 4 ++-- examples/StreamingAndFormatting.cpp | 15 ++++++++------- src/include/deepstate/Log.h | 11 ++++++----- src/lib/Log.c | 14 ++++++++------ 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/examples/Fixture.cpp b/examples/Fixture.cpp index ba288b5..1d64443 100644 --- a/examples/Fixture.cpp +++ b/examples/Fixture.cpp @@ -20,12 +20,12 @@ class MyTest : public deepstate::Test { public: void SetUp(void) { - LOG(INFO) + LOG(TRACE) << "Setting up!"; } void TearDown(void) { - LOG(INFO) + LOG(TRACE) << "Tearing down!"; } diff --git a/examples/StreamingAndFormatting.cpp b/examples/StreamingAndFormatting.cpp index 9c5ff3d..42fa2dd 100644 --- a/examples/StreamingAndFormatting.cpp +++ b/examples/StreamingAndFormatting.cpp @@ -18,19 +18,20 @@ TEST(Streaming, BasicLevels) { LOG(DEBUG) << "This is a debug message"; - LOG(INFO) << "This is an info message"; + LOG(TRACE) << "This is a trace message"; + LOG(INFO) << "This is an info message"; LOG(WARNING) << "This is a warning message"; LOG(ERROR) << "This is a error message"; - LOG(INFO) << "This is a info message again"; + LOG(TRACE) << "This is a trace message again"; ASSERT(true) << "This should not be printed."; } TEST(Streaming, BasicTypes) { - LOG(INFO) << 'a'; - LOG(INFO) << 1; - LOG(INFO) << 1.0; - LOG(INFO) << "string"; - LOG(INFO) << nullptr; + LOG(TRACE) << 'a'; + LOG(TRACE) << 1; + LOG(TRACE) << 1.0; + LOG(TRACE) << "string"; + LOG(TRACE) << nullptr; } TEST(Formatting, OverridePrintf) { diff --git a/src/include/deepstate/Log.h b/src/include/deepstate/Log.h index 7763c5d..5a05afb 100644 --- a/src/include/deepstate/Log.h +++ b/src/include/deepstate/Log.h @@ -34,12 +34,13 @@ struct DeepState_VarArgs { enum DeepState_LogLevel { DeepState_LogDebug = 0, - DeepState_LogInfo = 1, - DeepState_LogWarning = 2, + DeepState_LogTrace = 1, + DeepState_LogInfo = 2, + DeepState_LogWarning = 3, DeepState_LogWarn = DeepState_LogWarning, - DeepState_LogError = 3, - DeepState_LogExternal = 4, - DeepState_LogFatal = 5, + DeepState_LogError = 4, + DeepState_LogExternal = 5, + DeepState_LogFatal = 6, DeepState_LogCritical = DeepState_LogFatal, }; diff --git a/src/lib/Log.c b/src/lib/Log.c index cf31c04..b352df1 100644 --- a/src/lib/Log.c +++ b/src/lib/Log.c @@ -47,6 +47,8 @@ static const char *DeepState_LogLevelStr(enum DeepState_LogLevel level) { switch (level) { case DeepState_LogDebug: return "DEBUG"; + case DeepState_LogTrace: + return "TRACE"; case DeepState_LogInfo: return "INFO"; case DeepState_LogWarning: @@ -136,7 +138,7 @@ void DeepState_LogFormat(enum DeepState_LogLevel level, /* Override libc! */ DEEPSTATE_NOINLINE int puts(const char *str) { - DeepState_Log(DeepState_LogInfo, str); + DeepState_Log(DeepState_LogTrace, str); return 0; } @@ -144,7 +146,7 @@ DEEPSTATE_NOINLINE int printf(const char *format, ...) { va_list args; va_start(args, format); - DeepState_LogVFormat(DeepState_LogInfo, format, args); + DeepState_LogVFormat(DeepState_LogTrace, format, args); va_end(args); return 0; } @@ -153,20 +155,20 @@ DEEPSTATE_NOINLINE int __printf_chk(int flag, const char *format, ...) { va_list args; va_start(args, format); - DeepState_LogVFormat(DeepState_LogInfo, format, args); + DeepState_LogVFormat(DeepState_LogTrace, format, args); va_end(args); return 0; } DEEPSTATE_NOINLINE int vprintf(const char *format, va_list args) { - DeepState_LogVFormat(DeepState_LogInfo, format, args); + DeepState_LogVFormat(DeepState_LogTrace, format, args); return 0; } DEEPSTATE_NOINLINE int __vprintf_chk(int flag, const char *format, va_list args) { - DeepState_LogVFormat(DeepState_LogInfo, format, args); + DeepState_LogVFormat(DeepState_LogTrace, format, args); return 0; } @@ -175,7 +177,7 @@ int vfprintf(FILE *file, const char *format, va_list args) { if (stderr == file) { DeepState_LogVFormat(DeepState_LogDebug, format, args); } else if (stdout == file) { - DeepState_LogVFormat(DeepState_LogInfo, format, args); + DeepState_LogVFormat(DeepState_LogTrace, format, args); } else { DeepState_LogVFormat(DeepState_LogExternal, format, args); } From 7efe5f84ad8f7c0a0bed36c758fbcd185376bea8 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sat, 22 Dec 2018 13:52:18 -0700 Subject: [PATCH 02/19] Add macro for TRACE logging --- src/include/deepstate/DeepState.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/include/deepstate/DeepState.hpp b/src/include/deepstate/DeepState.hpp index 2d8ca64..e4c0617 100644 --- a/src/include/deepstate/DeepState.hpp +++ b/src/include/deepstate/DeepState.hpp @@ -521,6 +521,9 @@ struct Comparer { #define LOG_DEBUG(cond) \ ::deepstate::Stream(DeepState_LogDebug, (cond), __FILE__, __LINE__) +#define LOG_TRACE(cond) \ + ::deepstate::Stream(DeepState_LogTrace, (cond), __FILE__, __LINE__) + #define LOG_INFO(cond) \ ::deepstate::Stream(DeepState_LogInfo, (cond), __FILE__, __LINE__) From 0f9fe27288d162b88492717f98b9861830b12dda Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sat, 22 Dec 2018 14:00:11 -0700 Subject: [PATCH 03/19] handle new logging in symex --- bin/deepstate/common.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index 59828aa..0797e9d 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -32,11 +32,12 @@ class TestInfo(object): LOG_LEVEL_DEBUG = 0 -LOG_LEVEL_INFO = 1 -LOG_LEVEL_WARNING = 2 -LOG_LEVEL_ERROR = 3 -LOG_LEVEL_EXTERNAL = 4 -LOG_LEVEL_FATAL = 5 +LOG_LEVEL_TRACE = 1 +LOG_LEVEL_INFO = 2 +LOG_LEVEL_WARNING = 3 +LOG_LEVEL_ERROR = 4 +LOG_LEVEL_EXTERNAL = 5 +LOG_LEVEL_FATAL = 6 LOGGER = logging.getLogger("deepstate") @@ -45,6 +46,7 @@ LOGGER.setLevel(logging.DEBUG) LOG_LEVEL_TO_LOGGER = { LOG_LEVEL_DEBUG: LOGGER.debug, + LOG_LEVEL_TRACE: LOGGER.trace, LOG_LEVEL_INFO: LOGGER.info, LOG_LEVEL_WARNING: LOGGER.warning, LOG_LEVEL_ERROR: LOGGER.error, From 816ec7a27dc0c7044ce6198c0ad10e9d8829737e Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sat, 22 Dec 2018 14:12:17 -0700 Subject: [PATCH 04/19] try to add trace level --- bin/deepstate/common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index 0797e9d..633fd37 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -42,7 +42,8 @@ LOG_LEVEL_FATAL = 6 LOGGER = logging.getLogger("deepstate") LOGGER.setLevel(logging.DEBUG) - +LOGGER.addLevelName(15, "TRACE") +LOGGER.trace = 15 LOG_LEVEL_TO_LOGGER = { LOG_LEVEL_DEBUG: LOGGER.debug, From 6f168e8e1c64a99fa36cb0c6f91b436eea7636c0 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sat, 22 Dec 2018 14:16:16 -0700 Subject: [PATCH 05/19] add level name at right place --- bin/deepstate/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index 633fd37..bed6e8f 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -14,6 +14,7 @@ import logging logging.basicConfig() +logging.addLevelName(15, "TRACE") import argparse import md5 @@ -42,7 +43,6 @@ LOG_LEVEL_FATAL = 6 LOGGER = logging.getLogger("deepstate") LOGGER.setLevel(logging.DEBUG) -LOGGER.addLevelName(15, "TRACE") LOGGER.trace = 15 LOG_LEVEL_TO_LOGGER = { From feec722f83feeb7d83ad2713b63c00d1224d8e2e Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sat, 22 Dec 2018 14:34:24 -0700 Subject: [PATCH 06/19] handled for TRACE --- bin/deepstate/common.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index bed6e8f..8a8cddc 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -43,7 +43,9 @@ LOG_LEVEL_FATAL = 6 LOGGER = logging.getLogger("deepstate") LOGGER.setLevel(logging.DEBUG) -LOGGER.trace = 15 +def logTrace(msg, *args, **kwargs): + logging.log(15, msg, args, kwargs) +LOGGER.trace = logTrace LOG_LEVEL_TO_LOGGER = { LOG_LEVEL_DEBUG: LOGGER.debug, From 7fb1a04a4aaa2635a47a6d80f064a1b1b68fe008 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sat, 22 Dec 2018 15:22:00 -0700 Subject: [PATCH 07/19] change name --- bin/deepstate/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index 8a8cddc..a4af86b 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -43,9 +43,9 @@ LOG_LEVEL_FATAL = 6 LOGGER = logging.getLogger("deepstate") LOGGER.setLevel(logging.DEBUG) -def logTrace(msg, *args, **kwargs): +def log_trace(msg, *args, **kwargs): logging.log(15, msg, args, kwargs) -LOGGER.trace = logTrace +LOGGER.trace = log_trace LOG_LEVEL_TO_LOGGER = { LOG_LEVEL_DEBUG: LOGGER.debug, From 55644b534e1f0211ea5f6bbca700791f336ba227 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sat, 22 Dec 2018 19:53:02 -0700 Subject: [PATCH 08/19] set level --- bin/deepstate/main_angr.py | 2 +- bin/deepstate/main_manticore.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/deepstate/main_angr.py b/bin/deepstate/main_angr.py index a35bd58..99891f9 100644 --- a/bin/deepstate/main_angr.py +++ b/bin/deepstate/main_angr.py @@ -20,7 +20,7 @@ import traceback from .common import DeepState, TestInfo L = logging.getLogger("deepstate.angr") -L.setLevel(logging.INFO) +L.setLevel(logging.TRACE) class DeepAngr(DeepState): diff --git a/bin/deepstate/main_manticore.py b/bin/deepstate/main_manticore.py index 26d6672..cd5b8e3 100644 --- a/bin/deepstate/main_manticore.py +++ b/bin/deepstate/main_manticore.py @@ -33,7 +33,7 @@ from manticore.core.state import TerminateState L = logging.getLogger("deepstate.mcore") -L.setLevel(logging.INFO) +L.setLevel(logging.TRACE) OUR_TERMINATION_REASON = "I DeepState'd it" From 3590a6025c74e41a40503cbd1fd96442f5d82d08 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sat, 22 Dec 2018 20:46:08 -0700 Subject: [PATCH 09/19] add trace to manticore/angr logging --- bin/deepstate/main_angr.py | 6 +++++- bin/deepstate/main_manticore.py | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bin/deepstate/main_angr.py b/bin/deepstate/main_angr.py index 99891f9..7659fb2 100644 --- a/bin/deepstate/main_angr.py +++ b/bin/deepstate/main_angr.py @@ -19,8 +19,12 @@ import multiprocessing import traceback from .common import DeepState, TestInfo +logging.addLevelName(15, "TRACE") L = logging.getLogger("deepstate.angr") -L.setLevel(logging.TRACE) +def log_trace(msg, *args, **kwargs): + logging.log(15, msg, args, kwargs) +L.TRACE = log_trace +L.setLevel(L.TRACE) class DeepAngr(DeepState): diff --git a/bin/deepstate/main_manticore.py b/bin/deepstate/main_manticore.py index cd5b8e3..e85fab6 100644 --- a/bin/deepstate/main_manticore.py +++ b/bin/deepstate/main_manticore.py @@ -31,9 +31,12 @@ from .common import DeepState, TestInfo from manticore.core.state import TerminateState - -L = logging.getLogger("deepstate.mcore") -L.setLevel(logging.TRACE) +logging.addLevelName(15, "TRACE") +L = logging.getLogger("deepstate.angr") +def log_trace(msg, *args, **kwargs): + logging.log(15, msg, args, kwargs) +L.TRACE = log_trace +L.setLevel(L.TRACE) OUR_TERMINATION_REASON = "I DeepState'd it" From 276b4936817168d2787af9da88f2c592c4145c30 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sat, 22 Dec 2018 20:49:10 -0700 Subject: [PATCH 10/19] log in manticore/angr --- bin/deepstate/main_angr.py | 2 +- bin/deepstate/main_manticore.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/deepstate/main_angr.py b/bin/deepstate/main_angr.py index 7659fb2..8a52e39 100644 --- a/bin/deepstate/main_angr.py +++ b/bin/deepstate/main_angr.py @@ -23,7 +23,7 @@ logging.addLevelName(15, "TRACE") L = logging.getLogger("deepstate.angr") def log_trace(msg, *args, **kwargs): logging.log(15, msg, args, kwargs) -L.TRACE = log_trace +L.TRACE = 15 L.setLevel(L.TRACE) diff --git a/bin/deepstate/main_manticore.py b/bin/deepstate/main_manticore.py index e85fab6..1aede3c 100644 --- a/bin/deepstate/main_manticore.py +++ b/bin/deepstate/main_manticore.py @@ -32,10 +32,10 @@ from .common import DeepState, TestInfo from manticore.core.state import TerminateState logging.addLevelName(15, "TRACE") -L = logging.getLogger("deepstate.angr") +L = logging.getLogger("deepstate.manticore") def log_trace(msg, *args, **kwargs): logging.log(15, msg, args, kwargs) -L.TRACE = log_trace +L.TRACE = 15 L.setLevel(L.TRACE) OUR_TERMINATION_REASON = "I DeepState'd it" From ce343948e2abe29f06855d6975afc8f02e8fe0ae Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sun, 23 Dec 2018 12:40:47 -0700 Subject: [PATCH 11/19] try different python approach --- bin/deepstate/common.py | 6 +++--- bin/deepstate/main_angr.py | 6 +----- bin/deepstate/main_manticore.py | 6 +----- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index a4af86b..90fbc36 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -20,6 +20,7 @@ import argparse import md5 import os import struct +import functools class TestInfo(object): @@ -43,13 +44,12 @@ LOG_LEVEL_FATAL = 6 LOGGER = logging.getLogger("deepstate") LOGGER.setLevel(logging.DEBUG) -def log_trace(msg, *args, **kwargs): +def log_trace(msg, *args, **kwargs) logging.log(15, msg, args, kwargs) -LOGGER.trace = log_trace LOG_LEVEL_TO_LOGGER = { LOG_LEVEL_DEBUG: LOGGER.debug, - LOG_LEVEL_TRACE: LOGGER.trace, + LOG_LEVEL_TRACE: functools.partial(logging.log, 15), LOG_LEVEL_INFO: LOGGER.info, LOG_LEVEL_WARNING: LOGGER.warning, LOG_LEVEL_ERROR: LOGGER.error, diff --git a/bin/deepstate/main_angr.py b/bin/deepstate/main_angr.py index 8a52e39..cbe101a 100644 --- a/bin/deepstate/main_angr.py +++ b/bin/deepstate/main_angr.py @@ -19,12 +19,8 @@ import multiprocessing import traceback from .common import DeepState, TestInfo -logging.addLevelName(15, "TRACE") L = logging.getLogger("deepstate.angr") -def log_trace(msg, *args, **kwargs): - logging.log(15, msg, args, kwargs) -L.TRACE = 15 -L.setLevel(L.TRACE) +L.setLevel(logging.DEBUG) class DeepAngr(DeepState): diff --git a/bin/deepstate/main_manticore.py b/bin/deepstate/main_manticore.py index 1aede3c..b545385 100644 --- a/bin/deepstate/main_manticore.py +++ b/bin/deepstate/main_manticore.py @@ -31,12 +31,8 @@ from .common import DeepState, TestInfo from manticore.core.state import TerminateState -logging.addLevelName(15, "TRACE") L = logging.getLogger("deepstate.manticore") -def log_trace(msg, *args, **kwargs): - logging.log(15, msg, args, kwargs) -L.TRACE = 15 -L.setLevel(L.TRACE) +L.setLevel(logging.DEBUG) OUR_TERMINATION_REASON = "I DeepState'd it" From 43ddfa895cead4b847c8393a0bb7bb46539917d9 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sun, 23 Dec 2018 12:44:20 -0700 Subject: [PATCH 12/19] oops, remove log_trace def --- bin/deepstate/common.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index 90fbc36..741b210 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -44,8 +44,6 @@ LOG_LEVEL_FATAL = 6 LOGGER = logging.getLogger("deepstate") LOGGER.setLevel(logging.DEBUG) -def log_trace(msg, *args, **kwargs) - logging.log(15, msg, args, kwargs) LOG_LEVEL_TO_LOGGER = { LOG_LEVEL_DEBUG: LOGGER.debug, From 6daee3cfa0ce91665b7bc3e266f8f921234880c5 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sun, 23 Dec 2018 12:53:16 -0700 Subject: [PATCH 13/19] try just using the info logger --- bin/deepstate/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index 741b210..52599c5 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -47,7 +47,7 @@ LOGGER.setLevel(logging.DEBUG) LOG_LEVEL_TO_LOGGER = { LOG_LEVEL_DEBUG: LOGGER.debug, - LOG_LEVEL_TRACE: functools.partial(logging.log, 15), + LOG_LEVEL_TRACE: LOGGER.info, LOG_LEVEL_INFO: LOGGER.info, LOG_LEVEL_WARNING: LOGGER.warning, LOG_LEVEL_ERROR: LOGGER.error, From 4409762f24d12d3ed83bfc8bde2b14cb3416a84e Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sun, 23 Dec 2018 13:00:25 -0700 Subject: [PATCH 14/19] functools annoys pyflakes --- bin/deepstate/common.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index 52599c5..453d305 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -20,7 +20,6 @@ import argparse import md5 import os import struct -import functools class TestInfo(object): From 37d9d35d5aa8cf692f517b523e0294832aa81ece Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sun, 23 Dec 2018 13:07:27 -0700 Subject: [PATCH 15/19] aha, used wrong logger --- bin/deepstate/common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index 453d305..c333d41 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -17,6 +17,7 @@ logging.basicConfig() logging.addLevelName(15, "TRACE") import argparse +import functools import md5 import os import struct @@ -46,7 +47,7 @@ LOGGER.setLevel(logging.DEBUG) LOG_LEVEL_TO_LOGGER = { LOG_LEVEL_DEBUG: LOGGER.debug, - LOG_LEVEL_TRACE: LOGGER.info, + LOG_LEVEL_TRACE: functools.partial(LOGGER.log, 15) LOG_LEVEL_INFO: LOGGER.info, LOG_LEVEL_WARNING: LOGGER.warning, LOG_LEVEL_ERROR: LOGGER.error, From fca5c8795b5268208278924369b52f66ff960235 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sun, 23 Dec 2018 13:10:03 -0700 Subject: [PATCH 16/19] fix missing comma --- bin/deepstate/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/deepstate/common.py b/bin/deepstate/common.py index c333d41..1ee596b 100644 --- a/bin/deepstate/common.py +++ b/bin/deepstate/common.py @@ -47,7 +47,7 @@ LOGGER.setLevel(logging.DEBUG) LOG_LEVEL_TO_LOGGER = { LOG_LEVEL_DEBUG: LOGGER.debug, - LOG_LEVEL_TRACE: functools.partial(LOGGER.log, 15) + LOG_LEVEL_TRACE: functools.partial(LOGGER.log, 15), LOG_LEVEL_INFO: LOGGER.info, LOG_LEVEL_WARNING: LOGGER.warning, LOG_LEVEL_ERROR: LOGGER.error, From 12c23f78b9a24fb0a7b64c44f0b490c0aeb89bb4 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sun, 23 Dec 2018 13:13:08 -0700 Subject: [PATCH 17/19] restore old manticore/angr code --- bin/deepstate/main_angr.py | 2 +- bin/deepstate/main_manticore.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/deepstate/main_angr.py b/bin/deepstate/main_angr.py index cbe101a..a35bd58 100644 --- a/bin/deepstate/main_angr.py +++ b/bin/deepstate/main_angr.py @@ -20,7 +20,7 @@ import traceback from .common import DeepState, TestInfo L = logging.getLogger("deepstate.angr") -L.setLevel(logging.DEBUG) +L.setLevel(logging.INFO) class DeepAngr(DeepState): diff --git a/bin/deepstate/main_manticore.py b/bin/deepstate/main_manticore.py index b545385..0cf7dd5 100644 --- a/bin/deepstate/main_manticore.py +++ b/bin/deepstate/main_manticore.py @@ -31,8 +31,8 @@ from .common import DeepState, TestInfo from manticore.core.state import TerminateState -L = logging.getLogger("deepstate.manticore") -L.setLevel(logging.DEBUG) +L = logging.getLogger("deepstate.mcore") +L.setLevel(logging.INFO) OUR_TERMINATION_REASON = "I DeepState'd it" From c91853828dad15dac2f54f11df3cea7cf420f135 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sun, 23 Dec 2018 13:13:59 -0700 Subject: [PATCH 18/19] restore spacing in manticore to avoid confusion --- bin/deepstate/main_manticore.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/deepstate/main_manticore.py b/bin/deepstate/main_manticore.py index 0cf7dd5..26d6672 100644 --- a/bin/deepstate/main_manticore.py +++ b/bin/deepstate/main_manticore.py @@ -31,6 +31,7 @@ from .common import DeepState, TestInfo from manticore.core.state import TerminateState + L = logging.getLogger("deepstate.mcore") L.setLevel(logging.INFO) From 30601a580aebe95f0232a5641145e2249d628de4 Mon Sep 17 00:00:00 2001 From: Alex Groce Date: Sun, 23 Dec 2018 13:22:48 -0700 Subject: [PATCH 19/19] fix streaming and formatting test --- tests/test_streamingandformatting.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_streamingandformatting.py b/tests/test_streamingandformatting.py index baca7d0..9c2d889 100644 --- a/tests/test_streamingandformatting.py +++ b/tests/test_streamingandformatting.py @@ -11,10 +11,11 @@ class StreamingAndFormattingTest(deepstate_base.DeepStateTestCase): self.assertTrue("Failed: Streaming_BasicLevels" in output) self.assertTrue("This is a debug message" in output) + self.assertTrue("This is a trace message" in output) self.assertTrue("This is an info message" in output) self.assertTrue("This is a warning message" in output) self.assertTrue("This is a error message" in output) - self.assertTrue("This is a info message again" in output) + self.assertTrue("This is a trace message again" in output) self.assertTrue(": 97" in output) self.assertTrue(": 1" in output) self.assertTrue(": 1.000000" in output)