diff options
| author | Ladar Levison <ladar@lavabit.com> | 2018-11-22 09:28:25 +0300 |
|---|---|---|
| committer | Ladar Levison <ladar@lavabit.com> | 2018-11-22 09:28:25 +0300 |
| commit | be9f7e4fecae8b911c9f41b5e91522d462e686af (patch) | |
| tree | 2106ca9c7e7bc2731ccffff0a42f930fd168926c /check | |
| parent | 6fa40e33b273f7c3adc69ce04b0d5f28d58705c4 (diff) | |
Check will always print to console. Errors always goto log file (if enabled).
Diffstat (limited to 'check')
| -rw-r--r-- | check/magma/magma_check.c | 4 | ||||
| -rw-r--r-- | check/magma/magma_check.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/check/magma/magma_check.c b/check/magma/magma_check.c index 1a81cee2..e4ce15cd 100644 --- a/check/magma/magma_check.c +++ b/check/magma/magma_check.c @@ -7,6 +7,7 @@ #include "magma_check.h" +extern FILE *log_descriptor; chr_t *barrister_unit_test = NULL; int_t case_timeout = RUN_TEST_CASE_TIMEOUT; bool_t do_virus_check = true, do_tank_check = true, do_dspam_check = true, do_spf_check = true, do_dkim_check = true; @@ -375,6 +376,9 @@ int main(int argc, char *argv[]) { ns_cleanup(barrister_unit_test); + // We used a log file handle, we need to close it. + if (log_descriptor) fclose(log_descriptor); + // Close the console descriptors, if they are still valid. if ((errno = 0) || (fcntl(STDIN_FILENO, F_GETFL) != -1 && errno != EBADF)) close(STDIN_FILENO); if ((errno = 0) || (fcntl(STDOUT_FILENO, F_GETFL) != -1 && errno != EBADF)) close(STDOUT_FILENO); diff --git a/check/magma/magma_check.h b/check/magma/magma_check.h index c08f8a41..ada35115 100644 --- a/check/magma/magma_check.h +++ b/check/magma/magma_check.h @@ -41,7 +41,7 @@ extern int case_timeout; -#define log_unit(...) log_internal (__FILE__, __FUNCTION__, __LINE__, M_LOG_LINE_FEED_DISABLE | M_LOG_TIME_DISABLE | M_LOG_FILE_DISABLE | M_LOG_LINE_DISABLE | M_LOG_FUNCTION_DISABLE | M_LOG_STACK_TRACE_DISABLE, __VA_ARGS__) +#define log_unit(...) log_internal (__FILE__, __FUNCTION__, __LINE__, M_LOG_CONSOLE | M_LOG_LINE_FEED_DISABLE | M_LOG_TIME_DISABLE | M_LOG_FILE_DISABLE | M_LOG_LINE_DISABLE | M_LOG_FUNCTION_DISABLE | M_LOG_STACK_TRACE_DISABLE, __VA_ARGS__) //#define testcase(s, tc, name, func) tcase_add_test((tc = tcase_create(name)), func); tcase_set_timeout(tc, case_timeout); suite_add_tcase(s, tc) Suite * suite_check_sample(void); |