mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Birdtest: Put hard new lines for strict line width

Browse Source 
This patch ensures width of output lines from testing framework (not
debug output). So output piped lined into file that has default width 80
cols is now correctly wrapped.
This commit is contained in:
Pavel Tvrdik 2016-11-11 17:03:43 +01:00
parent fd328869cc
commit fa71b268a8
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/birdtest.c
View File

@ -187,8 +187,7 @@ get_num_terminal_cols(void)
static void static void
bt_log_result(int result, const char *fmt, va_list argptr) bt_log_result(int result, const char *fmt, va_list argptr)
{ {
char fmt_buf[BT_BUFFER_SIZE]; static char msg_buf[BT_BUFFER_SIZE];
char msg_buf[BT_BUFFER_SIZE];
char *pos; char *pos;
snprintf(msg_buf, sizeof(msg_buf), "%s%s%s%s", snprintf(msg_buf, sizeof(msg_buf), "%s%s%s%s",
@ -200,18 +199,33 @@ bt_log_result(int result, const char *fmt, va_list argptr)
vsnprintf(pos, sizeof(msg_buf) - (pos - msg_buf), fmt, argptr); vsnprintf(pos, sizeof(msg_buf) - (pos - msg_buf), fmt, argptr);
/* 'll' means here Last Line */ int chrs = 0;
uint cols = get_num_terminal_cols(); for (int i = 0; i < strlen(msg_buf); i += get_num_terminal_cols())
uint ll_len = (strlen(msg_buf) % cols) + BT_PROMPT_OK_FAIL_STRLEN; {
uint ll_offset = (ll_len / get_num_terminal_cols() + 1) * cols - BT_PROMPT_OK_FAIL_STRLEN; if (i)
uint offset = ll_offset + (strlen(msg_buf) / cols) * cols; printf("\n");
snprintf(fmt_buf, sizeof(fmt_buf), "%%-%us%%s\n", offset); char *stop = msg_buf + i + get_num_terminal_cols();
char backup = *stop;
*stop = 0;
chrs = printf("%s", msg_buf + i);
*stop = backup;
}
int offset = get_num_terminal_cols() - chrs - BT_PROMPT_OK_FAIL_STRLEN;
if (offset < 0)
{
printf("\n");
offset = get_num_terminal_cols() - BT_PROMPT_OK_FAIL_STRLEN;
}
for (int i = 0; i < offset; i++)
putchar(' ');
const char *result_str = is_terminal ? BT_PROMPT_OK : BT_PROMPT_OK_NO_COLOR; const char *result_str = is_terminal ? BT_PROMPT_OK : BT_PROMPT_OK_NO_COLOR;
if (result != BT_SUCCESS) if (result != BT_SUCCESS)
result_str = is_terminal ? BT_PROMPT_FAIL : BT_PROMPT_FAIL_NO_COLOR; result_str = is_terminal ? BT_PROMPT_FAIL : BT_PROMPT_FAIL_NO_COLOR;
printf(fmt_buf, msg_buf, result_str); printf("%s\n", result_str);
} }
/** /**