c/libuv
1
0
Fork 0
mirror of https://github.com/libuv/libuv synced 2025-03-28 21:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: support partial output lines in test runner (#4744)

Browse Source 
This commit updates the test runner's print_lines() logic to
better handle partial lines.
This commit is contained in:
Colin Ihrig 2025-03-24 00:00:22 -04:00 committed by GitHub
parent ea1cf034be
commit 2b96e47f12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/runner-unix.c
View File

@ -367,6 +367,7 @@ long int process_output_size(process_info_t *p) {
/* Copy the contents of the stdio output buffer to `fd`. */ /* Copy the contents of the stdio output buffer to `fd`. */
int process_copy_output(process_info_t* p, FILE* stream) { int process_copy_output(process_info_t* p, FILE* stream) {
char buf[1024]; char buf[1024];
int partial;
int r; int r;
r = fseek(p->stdout_file, 0, SEEK_SET); r = fseek(p->stdout_file, 0, SEEK_SET);
@ -375,9 +376,9 @@ int process_copy_output(process_info_t* p, FILE* stream) {
return -1; return -1;
} }
/* TODO: what if the line is longer than buf */ partial = 0;
while ((r = fread(buf, 1, sizeof(buf), p->stdout_file)) != 0) while ((r = fread(buf, 1, sizeof(buf), p->stdout_file)) != 0)
print_lines(buf, r, stream); partial = print_lines(buf, r, stream, partial);
if (ferror(p->stdout_file)) { if (ferror(p->stdout_file)) {
perror("read"); perror("read");

4
test/runner-win.c
View File

@ -219,6 +219,7 @@ long int process_output_size(process_info_t *p) {
int process_copy_output(process_info_t* p, FILE* stream) { int process_copy_output(process_info_t* p, FILE* stream) {
char buf[1024]; char buf[1024];
int partial;
int fd, r; int fd, r;
fd = _open_osfhandle((intptr_t)p->stdio_out, _O_RDONLY | _O_TEXT); fd = _open_osfhandle((intptr_t)p->stdio_out, _O_RDONLY | _O_TEXT);
@ -229,8 +230,9 @@ int process_copy_output(process_info_t* p, FILE* stream) {
if (r < 0) if (r < 0)
return -1; return -1;
partial = 0;
while ((r = _read(fd, buf, sizeof(buf))) != 0) while ((r = _read(fd, buf, sizeof(buf))) != 0)
print_lines(buf, r, stream); partial = print_lines(buf, r, stream, partial);
_close(fd); _close(fd);
return 0; return 0;

16
test/runner.c
View File

@ -426,13 +426,17 @@ void print_tests(FILE* stream) {
} }
void print_lines(const char* buffer, size_t size, FILE* stream) { int print_lines(const char* buffer, size_t size, FILE* stream, int partial) {
const char* start; const char* start;
const char* end; const char* end;
start = buffer; start = buffer;
while ((end = memchr(start, '\n', &buffer[size] - start))) { while ((end = memchr(start, '\n', &buffer[size] - start))) {
fputs("# ", stream); if (partial == 0)
fputs("# ", stream);
else
partial = 0;
fwrite(start, 1, (int)(end - start), stream); fwrite(start, 1, (int)(end - start), stream);
fputs("\n", stream); fputs("\n", stream);
fflush(stream); fflush(stream);
@ -441,9 +445,13 @@ void print_lines(const char* buffer, size_t size, FILE* stream) {
end = &buffer[size]; end = &buffer[size];
if (start < end) { if (start < end) {
fputs("# ", stream); if (partial == 0)
fputs("# ", stream);
fwrite(start, 1, (int)(end - start), stream); fwrite(start, 1, (int)(end - start), stream);
fputs("\n", stream);
fflush(stream); fflush(stream);
return 1;
} }
return 0;
} }

2
test/runner.h
View File

@ -123,7 +123,7 @@ int run_test_part(const char* test, const char* part);
void print_tests(FILE* stream); void print_tests(FILE* stream);
/* Print lines in |buffer| as TAP diagnostics to |stream|. */ /* Print lines in |buffer| as TAP diagnostics to |stream|. */
void print_lines(const char* buffer, size_t size, FILE* stream); int print_lines(const char* buffer, size_t size, FILE* stream, int partial);
/* /*
* Stuff that should be implemented by test-runner-<platform>.h * Stuff that should be implemented by test-runner-<platform>.h