From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by sourceware.org (Postfix) with ESMTPS id E0000385801A for ; Sun, 28 Feb 2021 23:06:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E0000385801A 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 4DpfCX6FCjz1qs3c; Mon, 1 Mar 2021 00:06:32 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4DpfCX4cVWz1qr51; Mon, 1 Mar 2021 00:06:32 +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 ywQLFdYbO8ne; Mon, 1 Mar 2021 00:06:30 +0100 (CET) X-Auth-Info: ucVUzO2WJ85QxZDNu5S5h4jumJwtLEjDtidurcyRa4I= Received: from jawa (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; Mon, 1 Mar 2021 00:06:30 +0100 (CET) Date: Mon, 1 Mar 2021 00:06:23 +0100 From: Lukasz Majewski To: Adhemerval Zanella Cc: Joseph Myers , Florian Weimer , DJ Delorie , Paul Eggert , Alistair Francis , Arnd Bergmann , Alistair Francis , GNU C Library , Carlos O'Donell , Florian Weimer , Zack Weinberg Subject: Re: [PATCH v4 1/3] tst: Extend cross-test-ssh.sh to specify if target date can be altered Message-ID: <20210301000623.076245ef@jawa> In-Reply-To: References: <20210217223158.16441-1-lukma@denx.de> Organization: denx.de X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/Jhx3aE28xcHf8mgAKrWDsqn"; protocol="application/pgp-signature" X-Spam-Status: No, score=-15.0 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: , X-List-Received-Date: Sun, 28 Feb 2021 23:06:35 -0000 --Sig_/Jhx3aE28xcHf8mgAKrWDsqn Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Adhemerval, > On 17/02/2021 19:31, Lukasz Majewski wrote: > > This code adds new flag - '--allow-time-setting' to > > cross-test-ssh.sh script to indicate if it is allowed to alter the > > date on the system on which tests are executed. This change is > > supposed to be used with test systems, which use virtual machines > > for testing. > >=20 > > The GLIBC_TEST_ALLOW_TIME_SETTING env variable is exported to the > > remote environment on which the eligible test is run and brings no > > functional change when it is not. > >=20 > > Changes for v2: > > - Utilize flock to provide serialization of cross-test-ssh.sh script > > execution. > > - Add entry to manual/install.texi about --allow-time-setting flag > > usage. > >=20 > > Changes for v3: > > - The install.texi manual has been augmented to explain two distinct > > use cases for setting the time on target system. > >=20 > > Changes for v4: > > - Add -w switch to flock (specify timeout) > > - Check return value of flock - exit ssh shell script > > - Allow user override of FLOCK_* variables > > - Rewrite the script's information/help text > > - Rewrite the install.texi manual entry for this > > script usage =20 >=20 > I think this would require a v5: if you decide to use the flock > command it should be documented on the manual, otherwise it should be > done with the .NOTPARALLEL special rule (as below).=20 >=20 > > --- > > manual/install.texi | 17 +++++++++++++++++ > > scripts/cross-test-ssh.sh | 26 +++++++++++++++++++++++++- > > 2 files changed, 42 insertions(+), 1 deletion(-) > >=20 > > diff --git a/manual/install.texi b/manual/install.texi > > index 419576f49c..5b32401805 100644 > > --- a/manual/install.texi > > +++ b/manual/install.texi > > @@ -380,6 +380,23 @@ the newly built binaries of @theglibc{}. The > > source and build directories must be visible at the same locations > > on both the build system and @var{hostname}. > > =20 > > +It is also possible to execute tests, which require setting date on > > +the target machine. Following use cases are supported: =20 >=20 > Two space after period. There are other occurrences that need to be > fixed on this patch as well. >=20 > > +@itemize @bullet > > +@item > > +@code{GLIBC_TEST_ALLOW_TIME_SETTING} is set in the environment in > > +which eligible tests are executed and have priviledges to run =20 >=20 > s/priviledges/privilege >=20 > > +@code{clock_settime}. In this case nothing prevents those tests > > from +running in parallel, so the caller shall assure that those > > tests +are serialized or provide a proper wrapper script for it. > > + > > +@item > > +The @code{cross-test-ssh.sh} script is used and one passes the > > +@option{--allow-time-setting} flag. In this case both setting > > +@code{GLIBC_TEST_ALLOW_TIME_SETTING} and serialization of tests > > +execution are assured automatically. > > +@end itemize > > + > > In general, when testing @theglibc{}, @samp{test-wrapper} may be > > set to the name and arguments of any program to run newly built > > binaries. This program must preserve the arguments to the binary > > being run, its diff --git a/scripts/cross-test-ssh.sh > > b/scripts/cross-test-ssh.sh index 6d8fbcdfd2..e73802974d 100755 > > --- a/scripts/cross-test-ssh.sh > > +++ b/scripts/cross-test-ssh.sh > > @@ -22,7 +22,7 @@ > > =20 > > progname=3D"$(basename $0)" > > =20 > > -usage=3D"usage: ${progname} [--ssh SSH] HOST COMMAND ..." > > +usage=3D"usage: ${progname} [--ssh SSH] [--allow-time-setting] HOST > > COMMAND ..." help=3D"Run a glibc test COMMAND on the remote machine > > HOST, via ssh, preserving the current working directory, and > > respecting quoting.=20 > > @@ -32,6 +32,11 @@ instead of ordinary 'ssh'. > > If the '--timeoutfactor FACTOR' flag is present, set TIMEOUTFACTOR > > on the remote machine to the specified FACTOR. > > =20 > > +If the '--allow-time-setting' flag is present, set > > +GLIBC_TEST_ALLOW_TIME_SETTING on the remote machine to indicate > > that +time can be safely adjusted when e.g. tests are run in a > > virtual +machine. =20 >=20 > Maybe: >=20 > time can be safely adjusted (e.g. on a virtual machine). >=20 > > + > > To use this to run glibc tests, invoke the tests as follows: > > =20 > > $ make test-wrapper=3D'ABSPATH/cross-test-ssh.sh HOST' tests > > @@ -81,6 +86,10 @@ while [ $# -gt 0 ]; do > > timeoutfactor=3D"$1" > > ;; > > =20 > > + "--allow-time-setting") > > + settimeallowed=3D"1" > > + ;; > > + > > "--help") > > echo "$usage" > > echo "$help" =20 >=20 > Ok. >=20 > > @@ -127,6 +136,21 @@ if [ "$timeoutfactor" ]; then > > ${command}" > > fi > > =20 > > +# Add command to set the info that time on target can be adjusted, > > +# if required. > > +# Serialize execution of this script on target to prevent from > > unintended +# change of target time. > > +FLOCK_PATH=3D"${FLOCK_PATH:-/var/lock/clock_settime}" > > +FLOCK_TIMEOUT=3D"${FLOCK_TIMEOUT:-20}" > > +FLOCK_FD=3D"${FLOCK_FD:-99}" > > +if [ "$settimeallowed" ]; then > > + command=3D"exec ${FLOCK_FD}<>${FLOCK_PATH} > > +flock -w ${FLOCK_TIMEOUT} ${FLOCK_FD} > > +if [ $? -ne 0 ]; then exit 1; fi > > +export GLIBC_TEST_ALLOW_TIME_SETTING=3D1 > > +${command}" > > +fi > > + > > # HOST's sshd simply concatenates its arguments with spaces and > > # passes them to some shell. We want to force the use of /bin/sh, > > # so we need to re-quote the whole command to ensure it appears as > > =20 >=20 > This requires the util-linux to be installed on the system (flock). > I think this should ok, but it need a note on the manual specifying > that if '--allow-time-setting' is used the 'flock' command should be > present on the target system. >=20 The 'flock' solution has on big advantage - it is easy to add to the cross-test-ssh.sh script. It just extends this particular wrapper (a few lines of code), as it is forbidden (for now) to adjust time on HOST (i.e. non VM) system. It works well for running Y2038 VM tests. > The usual way to force non-parallel testing (as done for nptl and > benchtests) is through the special target .NOTPARALLEL.=20 The approach with .NOTPARALLEL seems to be more generic, but would require some Makefiles (and Rules) modification, which may be time consuming. > Not sure > how easy would be to check , but one option would be to check > for '--allow-time-setting' on test-wrapper command and add the > .NOTPARALLEL rules as done in nptl/Makefile. I also think that the implementation would require checking arguments passed to 'test-wrapper' env variable and define .NOTPARALLEL: target for several Makefiles (in ./time , ./misc , ./io , etc.). I do have a feeling that for our purpose (to add tests) it would be easier for maintenance to use 'flock' and then (if required) move to .NOTPARALLEL. In the end of the day both approaches do their job, but IMHO 'flock' is easier to maintain and implement. Off topic: ---------- What is the purpose of MAKECMDGOALS variable in nptl/Makefile? It is only used in this place. Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de --Sig_/Jhx3aE28xcHf8mgAKrWDsqn Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAmA8Ie8ACgkQAR8vZIA0 zr0kAQf9F+3resQl6Kwl+geW7OJdLqr2sBGAHRZIUlEiqp4pwyiYk67PYC54rYvP rGj4FviNJmx2bS2MRatjRQ6/iXJ83S0pUWrMT0RHf7uBJUM/VBruiBF4qXh47Qs8 ObwsUeHXo928AKJ231Sydimkz0dztTXDWeIKhNvbesIq4ah77+Hy0rSmEPzq+wvE K7d5FpqpkbJCBZGTdsFGyppqbOzYSandl9RBVlSGsFXLVo4+KvB1d9xNvt17y/xK H7V5+vfrecbEsd2aj2haAmw0hs4xAYE9r1U0eoC1AWIxL7DkUUACSgoNHJC/9Hc3 0WmuW0xE4fho07KHJels8G51D6Ldow== =IbpY -----END PGP SIGNATURE----- --Sig_/Jhx3aE28xcHf8mgAKrWDsqn--