diff --git a/bin/utest/main.c b/bin/utest/main.c index 84b8929a6..5ec5f46c6 100644 --- a/bin/utest/main.c +++ b/bin/utest/main.c @@ -102,8 +102,6 @@ static int running(void) { return pending; } -const char *testname = NULL; - static void run_test(sigset_t *mask, test_entry_t *te) { timeval_t tv = timestamp(); const char *name = te->name; @@ -118,8 +116,6 @@ static void run_test(sigset_t *mask, test_entry_t *te) { setpgid(0, 0); xsigprocmask(SIG_SETMASK, mask, NULL); - testname = te->name; - if (te->flags & TF_DEBUG) __verbose = 1; diff --git a/bin/utest/utest.c b/bin/utest/utest.c index f842e02ae..cd16f7a09 100644 --- a/bin/utest/utest.c +++ b/bin/utest/utest.c @@ -13,8 +13,7 @@ static void print_msg(const char *file, int line, const char *fmt, va_list ap) { char *basename = strrchr(file, '/'); file = basename ? basename + 1 : file; - res = - snprintf_ss(buf, sizeof(buf), "[%s|%s:%d] ", testname ?: "?", file, line); + res = snprintf_ss(buf, sizeof(buf), "[%s:%d] ", file, line); if (res < 0) exit(EXIT_FAILURE); len += res; diff --git a/bin/utest/utest.h b/bin/utest/utest.h index b90a5ec31..7ef9e7818 100644 --- a/bin/utest/utest.h +++ b/bin/utest/utest.h @@ -34,7 +34,6 @@ typedef struct test_entry { */ extern int __verbose; -extern const char *testname; noreturn void __die(const char *file, int line, const char *fmt, ...); void __msg(const char *file, int line, const char *fmt, ...);