From 292fa4c7fbd3466fd06382a69d87226b03108d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Drago=C8=99-Iulian=20ARGINT?= <dragos.argint@stud.acs.upb.ro> Date: Sun, 30 Apr 2023 22:50:28 +0300 Subject: [PATCH] Update 2-uart-checker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: DragoČ-Iulian ARGINT <dragos.argint@stud.acs.upb.ro> --- checker/2-uart-checker/_test/test.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/checker/2-uart-checker/_test/test.c b/checker/2-uart-checker/_test/test.c index 7c5cef1..6e87f70 100644 --- a/checker/2-uart-checker/_test/test.c +++ b/checker/2-uart-checker/_test/test.c @@ -43,12 +43,13 @@ exit(EXIT_FAILURE); \ } while (0) + #define test(d, v, e, p) do_test((d), (v), (e), 0, 0, (p)) #define not_test(d, v, e, p) do_test((d), (v), (e), 1, 0, (p)) #define fatal_test(d, v, e,p) do_test((d), (v), (e), 0, 1, (p)) #define GENERIC_TEST_TIMEOUT 3 - +const int total = 92; void sig_handler(int signum) { fprintf(stderr, "Child process pid=%d of checker (that issues read/write syscalls to the driver) got killed after TIMEOUT=%ds\n", getpid(), GENERIC_TEST_TIMEOUT); @@ -68,23 +69,26 @@ do_test(const char *description, int value, int expected, int negate, int fatal, num_chars = printf("%s", description); for (; num_chars < PAD_CHARS - strlen("passed"); num_chars++) putchar('.'); - fflush(stdout); if (!negate) { if (value == expected) { - printf("passed %.1f\n", points); + printf("passed [%.1f/%d]\n", points, total); + fflush(stdout); return 0; } else { - printf("failed 0\n"); + printf("failed [0/%d]\n", total); + fflush(stdout); if (fatal) exit(EXIT_FAILURE); } } else { if (value != expected) { - printf("passed %.1f\n", points); + printf("passed [%.1f/%d]\n", points, total); + fflush(stdout); return 0; } else { - printf("failed 0\n"); + printf("failed [0/%d]\n", total); + fflush(stdout); if (fatal) exit(EXIT_FAILURE); } @@ -563,7 +567,6 @@ int main(void) { float num_passed = 0; - const int total = 92; signal(SIGTERM, sig_handler); srand(time(NULL)); -- GitLab