From patchwork Sun Feb 28 21:18:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 42175 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 73359384A01D; Sun, 28 Feb 2021 21:18:50 +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.9]) by sourceware.org (Postfix) with ESMTPS id E6FC9385801A for ; Sun, 28 Feb 2021 21:18:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E6FC9385801A 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 4Dpbq93Kwkz1qs0V; Sun, 28 Feb 2021 22:18:45 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4Dpbq921qjz1qr4v; Sun, 28 Feb 2021 22:18:45 +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 JOcSdtuwJwdn; Sun, 28 Feb 2021 22:18:43 +0100 (CET) X-Auth-Info: xNTavH9vSk82O3QuG0SKWh9gGAyRHJbGFE5CcjP+GbI= Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (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; Sun, 28 Feb 2021 22:18:43 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Adhemerval Zanella , Florian Weimer , DJ Delorie Subject: [PATCH] tst: Fix tst-timerfd test Date: Sun, 28 Feb 2021 22:18:29 +0100 Message-Id: <20210228211829.28680-1-lukma@denx.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-15.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, 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" There were following problems discovered for tst-timerfd test: 1. Do not set the struct itimerspec's it_interval tv_sec to 2 seconds. After this change the timerfd will trigger only once (the it_value is only set in this case). 2. The 'val1' variable (including the call to timerfd_gettime) is not needed anymore, as it is just enough to read the struct itimierspec after sleep. As a consequence the 'val2' has been renamed to 'val'. 3. After calling timerfd_gettime, the value of struct itimierspec time, when timer is running, is the remaining time. In the case of this test it would be less than 1 second. As a result the TEST_COMPARE macro logic had to be adjusted. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/tst-timerfd.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/sysdeps/unix/sysv/linux/tst-timerfd.c b/sysdeps/unix/sysv/linux/tst-timerfd.c index c850f7de35..8828399119 100644 --- a/sysdeps/unix/sysv/linux/tst-timerfd.c +++ b/sysdeps/unix/sysv/linux/tst-timerfd.c @@ -26,8 +26,8 @@ static int do_test (void) { - struct itimerspec settings = { { 2, 0 }, { 2, 0 } }; - struct itimerspec val1, val2; + struct itimerspec settings = { { 0, 0 }, { 2, 0 } }; + struct itimerspec val; int fd, ret; fd = timerfd_create (CLOCK_REALTIME, 0); @@ -39,26 +39,19 @@ do_test (void) if (ret != 0) FAIL_EXIT1 ("*** timerfd_settime failed: %m\n"); - /* Read the timer just before sleep. */ - ret = timerfd_gettime (fd, &val1); - if (ret != 0) - FAIL_EXIT1 ("*** timerfd_gettime failed: %m\n"); - /* Sleep for 1 second. */ ret = usleep (1000000); if (ret != 0) FAIL_EXIT1 ("*** usleep failed: %m\n"); /* Read the timer just after sleep. */ - ret = timerfd_gettime (fd, &val2); + ret = timerfd_gettime (fd, &val); if (ret != 0) FAIL_EXIT1 ("*** timerfd_gettime failed: %m\n"); /* Check difference between timerfd_gettime calls. */ - struct timespec r = timespec_sub (val2.it_value, val1.it_value); TEST_COMPARE (support_timespec_check_in_range - ((struct timespec) { 1, 0 }, r, 1.0, 1.5), 0); - + ((struct timespec) { 1, 0 }, val.it_value, 0.9, 1.0), 1); return 0; }