summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranton <>2022-11-22 10:40:10 +0000
committeranton <>2022-11-22 10:40:10 +0000
commitc7a0595f2ae7952c32ee996b5a8996d6339e688c (patch)
treec815ed751e884fefac29b92e70b356356b33b480
parentcc7039555f92f1d97380625f47b606fdcaeab60f (diff)
downloadopenbsd-c7a0595f2ae7952c32ee996b5a8996d6339e688c.tar.gz
openbsd-c7a0595f2ae7952c32ee996b5a8996d6339e688c.tar.bz2
openbsd-c7a0595f2ae7952c32ee996b5a8996d6339e688c.zip
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.
-rw-r--r--src/regress/lib/libc/time/time_conversion/timetest.c15
1 files changed, 6 insertions, 9 deletions
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 @@
1/* $OpenBSD: timetest.c,v 1.2 2022/11/09 18:11:45 beck Exp $ */ 1/* $OpenBSD: timetest.c,v 1.3 2022/11/22 10:40:10 anton Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2022 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
@@ -1826,14 +1826,11 @@ int main() {
1826 int verbose = 0; 1826 int verbose = 0;
1827 struct stat sb; 1827 struct stat sb;
1828 1828
1829 if (stat("/usr/share/zoneinfo/posix", &sb) == -1) { 1829 if (stat("/usr/share/zoneinfo/posix", &sb) == -1 ||
1830 fprintf(stderr, "WARNING: /usr/share/zoneinfo/posix not" 1830 stat("/usr/share/zoneinfo/right", &sb) == -1) {
1831 "present,\nCreate posix time zones to run this test.\n"); 1831 fprintf(stderr, "POSIX time zones missing, run the following command:\n\n"
1832 exit(0); 1832 "\tmake -C ../../../../../share/zoneinfo other_two\n\n"
1833 } 1833 "SKIPPED\n");
1834 if (stat("/usr/share/zoneinfo/right", &sb) == -1) {
1835 fprintf(stderr, "WARNING: /usr/share/zoneinfo/right not"
1836 "present,\nCreate right time zones to run this test.\n");
1837 exit(0); 1834 exit(0);
1838 } 1835 }
1839 1836