From patchwork Wed Feb 17 22:31:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1441419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DgszK5lr7z9sVJ for ; Thu, 18 Feb 2021 09:32:29 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EDAA4398B8BF; Wed, 17 Feb 2021 22:32:23 +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 72100398B8B8 for ; Wed, 17 Feb 2021 22:32:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 72100398B8B8 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 4Dgsz83S4Qz1rv05; Wed, 17 Feb 2021 23:32:20 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4Dgsz81xVSz1sP6v; Wed, 17 Feb 2021 23:32:20 +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 mHWxQMw3Ovec; Wed, 17 Feb 2021 23:32:18 +0100 (CET) X-Auth-Info: OH0/LcNSrx31NZ/nz9jcKhjev9In3m9fJIrcIDHa1Oo= 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; Wed, 17 Feb 2021 23:32:18 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Adhemerval Zanella , Florian Weimer , DJ Delorie Subject: [PATCH v4 2/3] support: Provide xclock_settime test helper function Date: Wed, 17 Feb 2021 23:31:57 +0100 Message-Id: <20210217223158.16441-2-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210217223158.16441-1-lukma@denx.de> References: <20210217223158.16441-1-lukma@denx.de> MIME-Version: 1.0 X-Spam-Status: No, score=-15.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, 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" The xclock_settime is a wrapper function on the clock_settime syscall to be used in the test code. It checks if the GLIBC_TEST_ALLOW_TIME_SETTING env variable is defined in the environment in which test is executed. If it is not - the test ends as unsupported. Otherwise, the clock-settime is executed and return value is assessed. Reviewed-by: Adhemerval Zanella --- Changes for v4: - Remove not needed #include --- support/Makefile | 1 + support/xclock_settime.c | 34 ++++++++++++++++++++++++++++++++++ support/xtime.h | 5 +++++ 3 files changed, 40 insertions(+) create mode 100644 support/xclock_settime.c diff --git a/support/Makefile b/support/Makefile index bb9889efb4..8d63fbd5da 100644 --- a/support/Makefile +++ b/support/Makefile @@ -90,6 +90,7 @@ libsupport-routines = \ xchdir \ xchroot \ xclock_gettime \ + xclock_settime \ xclose \ xchmod \ xconnect \ diff --git a/support/xclock_settime.c b/support/xclock_settime.c new file mode 100644 index 0000000000..183aba4876 --- /dev/null +++ b/support/xclock_settime.c @@ -0,0 +1,34 @@ +/* clock_settime with error checking. + 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 + +void +xclock_settime (clockid_t clockid, + const struct timespec *ts) +{ + if (getenv (SETTIME_ENV_NAME) == NULL) + FAIL_UNSUPPORTED ("clock_settime is executed only when "\ + SETTIME_ENV_NAME" is set\n"); + + const int ret = clock_settime (clockid, ts); + if (ret < 0) + FAIL_EXIT1 ("clock_settime (%d): %m", clockid); +} diff --git a/support/xtime.h b/support/xtime.h index 2482837dee..b4ac3b59e2 100644 --- a/support/xtime.h +++ b/support/xtime.h @@ -23,10 +23,15 @@ __BEGIN_DECLS +/* Name of the env variable, which indicates if it is possible to + adjust time on target machine. */ +#define SETTIME_ENV_NAME "GLIBC_TEST_ALLOW_TIME_SETTING" + /* The following functions call the corresponding libc functions and terminate the process on error. */ void xclock_gettime (clockid_t clock, struct timespec *ts); +void xclock_settime (clockid_t clock, const struct timespec *ts); /* This helper can often simplify tests by avoiding an explicit variable declaration or allowing that declaration to be const. */