From patchwork Wed Jan 27 22:16:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 41857 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D1059398B8A6; Wed, 27 Jan 2021 22:16:22 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by sourceware.org (Postfix) with ESMTPS id 03164398B880 for ; Wed, 27 Jan 2021 22:16:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 03164398B880 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4DQycK58hwz1rwbJ; Wed, 27 Jan 2021 23:16:17 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4DQycK3vwXz1t4Cj; Wed, 27 Jan 2021 23:16:17 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id RL8BCdL1pstV; Wed, 27 Jan 2021 23:16:15 +0100 (CET) X-Auth-Info: odxeSsSSeGcqkIgBl1A8xaX8HdJ+w1CPkYF1R30Tx28= Received: from localhost.localdomain (89-64-25-12.dynamic.chello.pl [89.64.25.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Wed, 27 Jan 2021 23:16:15 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Adhemerval Zanella , Florian Weimer Subject: [PATCH v3] tst: Provide Y2038 tests for mktime (tst-mktime4.c) Date: Wed, 27 Jan 2021 23:16:01 +0100 Message-Id: <20210127221601.30284-1-lukma@denx.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: GNU C Library , Florian Weimer , Alistair Francis Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This change adds new test to assess mktime's functionality. To be more specific - following use cases are checked: - Pass struct tm as epoch time - Pass struct tm as value just before Y2038 threshold (returned value shall be 0x7FFFFFFF) - Pass struct tm as the first value after Y2038 threshold (expected value - 0x80000000) --- Changes for v2: - Remove FAIL_UNSUPPORTED() when sizeof (time_t) <= 4 - Remove tzset () as it is already done in mktime () - Use TEST_COMPARE to check if correct result is received - Use "TZ=:" glibc extension to guarantee UTC time zone - Add two more checks - prepare struct tm in a way that mktime will return 0xFFFFFFFF and 0x100000000 Changes for v3: - Remove .tm_wday and .tm_yday as are irrelevant - Add (time_t) -1 cast when checking mktime return value - Replace "executed" with "compiled". - Use long long int as the exp_val type to avoid overflow compilation error - Rename tm1 to tm32bitmax - Define tm0, tmY2038, tm32bitmax as const - Pass the pointer to copy of aforementioned structs to test_mktime_helper --- time/Makefile | 2 +- time/tst-mktime4.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 time/tst-mktime4.c diff --git a/time/Makefile b/time/Makefile index 7de2ce0196..f214d001f5 100644 --- a/time/Makefile +++ b/time/Makefile @@ -51,7 +51,7 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 \ tst-adjtime tst-clock-y2038 tst-clock2-y2038 \ tst-cpuclock1-y2038 tst-clock_nanosleep-y2038 tst-clock_settime \ - tst-clock_adjtime tst-ctime tst-difftime + tst-clock_adjtime tst-ctime tst-difftime tst-mktime4 include ../Rules diff --git a/time/tst-mktime4.c b/time/tst-mktime4.c new file mode 100644 index 0000000000..3be1b5b76c --- /dev/null +++ b/time/tst-mktime4.c @@ -0,0 +1,99 @@ +/* Test for mktime (4) + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +const struct tm tm0 = { + .tm_year = 70, + .tm_mon = 0, + .tm_mday = 1, + .tm_hour = 0, + .tm_min = 0, + .tm_sec = 0, + .tm_wday = 4, + .tm_yday = 0 +}; + +const struct tm tmY2038 = { + .tm_year = 138, + .tm_mon = 0, + .tm_mday = 19, + .tm_hour = 3, + .tm_min = 14, + .tm_sec = 7, +}; + +const struct tm tm32bitmax = { + .tm_year = 206, + .tm_mon = 1, + .tm_mday = 7, + .tm_hour = 6, + .tm_min = 28, + .tm_sec = 15, +}; + +static +void test_mktime_helper (struct tm *tm, long long int exp_val) +{ + time_t result = mktime (tm); + if (result == (time_t) -1) + FAIL_EXIT1 ("*** mktime failed: %m"); + + TEST_COMPARE ((long long int) result, exp_val); +} + +static int +do_test (void) +{ + struct tm t; + /* Use glibc time zone extension "TZ=:" to to guarantee that UTC + without leap seconds is used for the test. */ + TEST_VERIFY_EXIT (setenv ("TZ", ":", 1) == 0); + + /* Check that mktime(1970-01-01 00:00:00) returns 0. */ + t = tm0; + test_mktime_helper (&t, 0); + + /* Check that mktime(2038-01-19 03:14:07) returns 0x7FFFFFFF. */ + t = tmY2038; + test_mktime_helper (&t, 0x7fffffff); + + if (sizeof (time_t) > 4) + { + /* Check that mktime(2038-01-19 03:14:08) returns 0x80000000 + (time_t overflow). */ + t = tmY2038; + t.tm_sec++; + test_mktime_helper (&t, 0x80000000); + + /* Check that mktime(2106-02-07 06:28:15) returns 0xFFFFFFFF. */ + t = tm32bitmax; + test_mktime_helper (&t, 0xFFFFFFFF); + + /* Check that mktime(2106-02-07 06:28:16) returns 0x100000000. */ + t = tm32bitmax; + t.tm_sec++; + test_mktime_helper (&t, 0x100000000); + } + + return 0; +} + +#include