From c7a0595f2ae7952c32ee996b5a8996d6339e688c Mon Sep 17 00:00:00 2001 From: anton <> Date: Tue, 22 Nov 2022 10:40:10 +0000 Subject: Be more helpful and provide details on what the time conversion tests need in order to run. Also, output the expected SKIPPED string as dictated by bsd.regress.mk. --- src/regress/lib/libc/time/time_conversion/timetest.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/regress/lib/libc/time/time_conversion/timetest.c b/src/regress/lib/libc/time/time_conversion/timetest.c index 77a7cbe115..075d7e4ad5 100644 --- a/src/regress/lib/libc/time/time_conversion/timetest.c +++ b/src/regress/lib/libc/time/time_conversion/timetest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: timetest.c,v 1.2 2022/11/09 18:11:45 beck Exp $ */ +/* $OpenBSD: timetest.c,v 1.3 2022/11/22 10:40:10 anton Exp $ */ /* * Copyright (c) 2022 Bob Beck <beck@openbsd.org> @@ -1826,14 +1826,11 @@ int main() { int verbose = 0; struct stat sb; - if (stat("/usr/share/zoneinfo/posix", &sb) == -1) { - fprintf(stderr, "WARNING: /usr/share/zoneinfo/posix not" - "present,\nCreate posix time zones to run this test.\n"); - exit(0); - } - if (stat("/usr/share/zoneinfo/right", &sb) == -1) { - fprintf(stderr, "WARNING: /usr/share/zoneinfo/right not" - "present,\nCreate right time zones to run this test.\n"); + if (stat("/usr/share/zoneinfo/posix", &sb) == -1 || + stat("/usr/share/zoneinfo/right", &sb) == -1) { + fprintf(stderr, "POSIX time zones missing, run the following command:\n\n" + "\tmake -C ../../../../../share/zoneinfo other_two\n\n" + "SKIPPED\n"); exit(0); } -- cgit v1.2.3-55-g6feb