Disable stdout buffering for LOG() when running tests
Normally the test runners run in 'forking mode'. When a lot of messages are logged to stdout, the child process can still be writing data when the parent writes 'ok' or 'not ok'. This can confuse the tap-driver.sh process.
This commit is contained in:
parent
1fbcdffff1
commit
57bd1be5b1
@ -3,6 +3,7 @@
|
|||||||
#include "config_ac.h"
|
#include "config_ac.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
@ -58,6 +59,9 @@ int main (void)
|
|||||||
struct log_config *lc = log_config_init_for_console(LOG_LEVEL_INFO, NULL);
|
struct log_config *lc = log_config_init_for_console(LOG_LEVEL_INFO, NULL);
|
||||||
log_start_from_param(lc);
|
log_start_from_param(lc);
|
||||||
log_config_free(lc);
|
log_config_free(lc);
|
||||||
|
/* Disable stdout buffering, as this can confuse the error
|
||||||
|
* reporting when running in libcheck fork mode */
|
||||||
|
setvbuf(stdout, NULL, _IONBF, 0);
|
||||||
|
|
||||||
/* Initialise the ssl module */
|
/* Initialise the ssl module */
|
||||||
ssl_init();
|
ssl_init();
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include "config_ac.h"
|
#include "config_ac.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
@ -177,6 +178,9 @@ int main (void)
|
|||||||
struct log_config *lc = log_config_init_for_console(LOG_LEVEL_INFO, NULL);
|
struct log_config *lc = log_config_init_for_console(LOG_LEVEL_INFO, NULL);
|
||||||
log_start_from_param(lc);
|
log_start_from_param(lc);
|
||||||
log_config_free(lc);
|
log_config_free(lc);
|
||||||
|
/* Disable stdout buffering, as this can confuse the error
|
||||||
|
* reporting when running in libcheck fork mode */
|
||||||
|
setvbuf(stdout, NULL, _IONBF, 0);
|
||||||
|
|
||||||
/* Initialise modules */
|
/* Initialise modules */
|
||||||
suite_test_libipm_calls_start();
|
suite_test_libipm_calls_start();
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include "config_ac.h"
|
#include "config_ac.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <check.h>
|
#include <check.h>
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
@ -22,6 +23,9 @@ int main (void)
|
|||||||
struct log_config *lc = log_config_init_for_console(LOG_LEVEL_INFO, NULL);
|
struct log_config *lc = log_config_init_for_console(LOG_LEVEL_INFO, NULL);
|
||||||
log_start_from_param(lc);
|
log_start_from_param(lc);
|
||||||
log_config_free(lc);
|
log_config_free(lc);
|
||||||
|
/* Disable stdout buffering, as this can confuse the error
|
||||||
|
* reporting when running in libcheck fork mode */
|
||||||
|
setvbuf(stdout, NULL, _IONBF, 0);
|
||||||
|
|
||||||
srunner_run_all (sr, CK_ENV);
|
srunner_run_all (sr, CK_ENV);
|
||||||
number_failed = srunner_ntests_failed(sr);
|
number_failed = srunner_ntests_failed(sr);
|
||||||
|
@ -26,6 +26,9 @@ int main(int argc, char **argv)
|
|||||||
config = log_config_init_for_console(LOG_LEVEL_DEBUG, NULL);
|
config = log_config_init_for_console(LOG_LEVEL_DEBUG, NULL);
|
||||||
log_start_from_param(config);
|
log_start_from_param(config);
|
||||||
log_config_free(config);
|
log_config_free(config);
|
||||||
|
/* Disable stdout buffering, as this can confuse the error
|
||||||
|
* reporting when running in libcheck fork mode */
|
||||||
|
setvbuf(stdout, NULL, _IONBF, 0);
|
||||||
|
|
||||||
srand(time(0));
|
srand(time(0));
|
||||||
obj = libmem_init(0x80000000, 64 * 1024 * 1024);
|
obj = libmem_init(0x80000000, 64 * 1024 * 1024);
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
|
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "os_calls.h"
|
#include "os_calls.h"
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "test_xrdp.h"
|
#include "test_xrdp.h"
|
||||||
@ -49,6 +50,9 @@ int main (void)
|
|||||||
g_getenv("TEST_LOG_LEVEL"));
|
g_getenv("TEST_LOG_LEVEL"));
|
||||||
log_start_from_param(logging);
|
log_start_from_param(logging);
|
||||||
log_config_free(logging);
|
log_config_free(logging);
|
||||||
|
/* Disable stdout buffering, as this can confuse the error
|
||||||
|
* reporting when running in libcheck fork mode */
|
||||||
|
setvbuf(stdout, NULL, _IONBF, 0);
|
||||||
|
|
||||||
sr = srunner_create (make_suite_test_bitmap_load());
|
sr = srunner_create (make_suite_test_bitmap_load());
|
||||||
srunner_add_suite(sr, make_suite_egfx_base_functions());
|
srunner_add_suite(sr, make_suite_egfx_base_functions());
|
||||||
|
Loading…
Reference in New Issue
Block a user