From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 603F43945C2C; Tue, 23 Feb 2021 20:39:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 603F43945C2C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] tst: Extend cross-test-ssh.sh to specify if target date can be altered X-Act-Checkin: glibc X-Git-Author: Lukasz Majewski X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: 12fe0d5b540c273f80db1ea5b93cd657defadf3d X-Git-Newrev: 17d74bd54d72fe8d98203bf2d5990855bc32bd72 Message-Id: <20210223203948.603F43945C2C@sourceware.org> Date: Tue, 23 Feb 2021 20:39:48 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Feb 2021 20:39:48 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=17d74bd54d72fe8d98203bf2d5990855bc32bd72 commit 17d74bd54d72fe8d98203bf2d5990855bc32bd72 Author: Lukasz Majewski Date: Fri Jan 15 16:40:39 2021 +0100 tst: Extend cross-test-ssh.sh to specify if target date can be altered 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. 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. 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. Changes for v3: - The install.texi manual has been augmented to explain two distinct use cases for setting the time on target system. Diff: --- manual/install.texi | 17 +++++++++++++++++ scripts/cross-test-ssh.sh | 22 +++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/manual/install.texi b/manual/install.texi index 419576f49c..13a8058616 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}. +It is also possible to execute tests, which require setting date on +the target machine. Following use cases are supported: +@itemize @bullet +@item +The @code{GLIBC_TEST_ALLOW_TIME_SETTING} is set in the environment in +which eligible tests are executed and have priviledges to run +@code{clock_settime}. In this case there is no prevention from running +those tests in parallel, so the caller shall assure that those tests +are serialized or provide proper wrapper script for it. + +@item +The @code{cross-test-ssh.sh} script is used and one passes +@option{--allow-time-setting} flag. In this case both - setting the +@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..c4b112aa1d 100755 --- a/scripts/cross-test-ssh.sh +++ b/scripts/cross-test-ssh.sh @@ -22,7 +22,7 @@ progname="$(basename $0)" -usage="usage: ${progname} [--ssh SSH] HOST COMMAND ..." +usage="usage: ${progname} [--ssh SSH][--allow-time-setting] HOST COMMAND ..." help="Run a glibc test COMMAND on the remote machine HOST, via ssh, preserving the current working directory, and respecting quoting. @@ -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. +If the '--allow-time-setting' flag is present, set +GLIBC_TEST_ALLOW_TIME_SETTING on the remote machine to inform that +time can be safely adjusted when e.g. tests are run in a virtual +machine. + To use this to run glibc tests, invoke the tests as follows: $ make test-wrapper='ABSPATH/cross-test-ssh.sh HOST' tests @@ -81,6 +86,10 @@ while [ $# -gt 0 ]; do timeoutfactor="$1" ;; + "--allow-time-setting") + settimeallowed="1" + ;; + "--help") echo "$usage" echo "$help" @@ -127,6 +136,17 @@ if [ "$timeoutfactor" ]; then ${command}" fi +# Add command to set the info that time on target can be adjusted, +# if required. +# Serialize execution of this script on host to prevent from unintended +# change of target time. +FLOCK_PATH="/var/lock/clock_settime" +if [ "$settimeallowed" ]; then + exec 99<>${FLOCK_PATH} + flock 99 || { echo "Cannot lock ${FLOCK_PATH}"; exit 1; } + command="export GLIBC_TEST_ALLOW_TIME_SETTING=1 ${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