public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/y2038] tst: Add test for clock_adjtime
@ 2021-02-23 20:40 Adhemerval Zanella
0 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella @ 2021-02-23 20:40 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=91b32cbf0591d63acb3967026456222069c0edc0
commit 91b32cbf0591d63acb3967026456222069c0edc0
Author: Lukasz Majewski <lukma@denx.de>
Date: Wed Jan 20 12:10:42 2021 +0100
tst: Add test for clock_adjtime
This code brings test to check if time on target machine is properly
adjusted.
The time is altered only when cross-test-ssh.sh is executed with
--allow-time-setting flag
As the delta added to CLOCK_REALTIME is only 1ms the original time is
not restored and further tests are executed with this bias.
Diff:
---
time/Makefile | 3 ++-
time/tst-clock_adjtime.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/time/Makefile b/time/Makefile
index b3c5368c3b..0d571fb777 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -48,7 +48,8 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \
tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3 \
tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 \
- tst-adjtime tst-ctime tst-difftime tst-mktime4 tst-clock_settime
+ tst-adjtime tst-ctime tst-difftime tst-mktime4 tst-clock_settime \
+ tst-clock_adjtime
include ../Rules
diff --git a/time/tst-clock_adjtime.c b/time/tst-clock_adjtime.c
new file mode 100644
index 0000000000..ece68acc5f
--- /dev/null
+++ b/time/tst-clock_adjtime.c
@@ -0,0 +1,61 @@
+/* Test for clock_adjtime
+ 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
+ <https://www.gnu.org/licenses/>. */
+
+#include <time.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/timex.h>
+#include <support/check.h>
+#include <support/xtime.h>
+
+static int
+do_test (void)
+{
+ struct timespec tv_then, tv_now;
+ struct timex delta;
+
+ /* Check if altering target time is allowed. */
+ if (getenv (SETTIME_ENV_NAME) == NULL)
+ FAIL_UNSUPPORTED ("clock_adjtime is executed only when "\
+ SETTIME_ENV_NAME" is set\n");
+
+ tv_then = xclock_now (CLOCK_REALTIME);
+
+ /* Setup time value to adjust - 1 ms. */
+ delta.time.tv_sec = 0;
+ delta.time.tv_usec = 1000;
+ delta.modes = ADJ_SETOFFSET;
+
+ int ret = clock_adjtime (CLOCK_REALTIME, &delta);
+ if (ret == -1)
+ FAIL_EXIT1 ("*** clock_adjtime failed: %m\n");
+
+ tv_now = xclock_now (CLOCK_REALTIME);
+
+ /* Check difference between timerfd_gettime calls. */
+ long long int diff = tv_now.tv_sec - tv_then.tv_sec;
+ diff *= 1000000000;
+ diff += tv_now.tv_nsec - tv_then.tv_nsec;
+ /* The adjustment cannot be large than 10 ms. */
+ if (diff > 10000000)
+ FAIL_EXIT1 ("clock_adjtime set wrong time!\n");
+
+ return 0;
+}
+
+#include <support/test-driver.c>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [glibc/azanella/y2038] tst: Add test for clock_adjtime
@ 2021-03-04 17:37 Adhemerval Zanella
0 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella @ 2021-03-04 17:37 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=693f090c56166004341e131517848dcf46349fed
commit 693f090c56166004341e131517848dcf46349fed
Author: Lukasz Majewski <lukma@denx.de>
Date: Wed Jan 20 12:10:42 2021 +0100
tst: Add test for clock_adjtime
This code brings test to check if time on target machine is properly
adjusted.
The time is altered only when cross-test-ssh.sh is executed with
--allow-time-setting flag
As the delta added to CLOCK_REALTIME is only 1ms the original time is
not restored and further tests are executed with this bias.
Diff:
---
sysdeps/unix/sysv/linux/Makefile | 4 +-
sysdeps/unix/sysv/linux/tst-clock_adjtime.c | 61 +++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 49934b26b4..97c99e378b 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -107,7 +107,9 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \
tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \
tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \
- tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes
+ tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes \
+ tst-clock_adjtime
+
tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc
CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables
diff --git a/sysdeps/unix/sysv/linux/tst-clock_adjtime.c b/sysdeps/unix/sysv/linux/tst-clock_adjtime.c
new file mode 100644
index 0000000000..ece68acc5f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-clock_adjtime.c
@@ -0,0 +1,61 @@
+/* Test for clock_adjtime
+ 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
+ <https://www.gnu.org/licenses/>. */
+
+#include <time.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/timex.h>
+#include <support/check.h>
+#include <support/xtime.h>
+
+static int
+do_test (void)
+{
+ struct timespec tv_then, tv_now;
+ struct timex delta;
+
+ /* Check if altering target time is allowed. */
+ if (getenv (SETTIME_ENV_NAME) == NULL)
+ FAIL_UNSUPPORTED ("clock_adjtime is executed only when "\
+ SETTIME_ENV_NAME" is set\n");
+
+ tv_then = xclock_now (CLOCK_REALTIME);
+
+ /* Setup time value to adjust - 1 ms. */
+ delta.time.tv_sec = 0;
+ delta.time.tv_usec = 1000;
+ delta.modes = ADJ_SETOFFSET;
+
+ int ret = clock_adjtime (CLOCK_REALTIME, &delta);
+ if (ret == -1)
+ FAIL_EXIT1 ("*** clock_adjtime failed: %m\n");
+
+ tv_now = xclock_now (CLOCK_REALTIME);
+
+ /* Check difference between timerfd_gettime calls. */
+ long long int diff = tv_now.tv_sec - tv_then.tv_sec;
+ diff *= 1000000000;
+ diff += tv_now.tv_nsec - tv_then.tv_nsec;
+ /* The adjustment cannot be large than 10 ms. */
+ if (diff > 10000000)
+ FAIL_EXIT1 ("clock_adjtime set wrong time!\n");
+
+ return 0;
+}
+
+#include <support/test-driver.c>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [glibc/azanella/y2038] tst: Add test for clock_adjtime
@ 2021-03-04 11:30 Adhemerval Zanella
0 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella @ 2021-03-04 11:30 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=693f090c56166004341e131517848dcf46349fed
commit 693f090c56166004341e131517848dcf46349fed
Author: Lukasz Majewski <lukma@denx.de>
Date: Wed Jan 20 12:10:42 2021 +0100
tst: Add test for clock_adjtime
This code brings test to check if time on target machine is properly
adjusted.
The time is altered only when cross-test-ssh.sh is executed with
--allow-time-setting flag
As the delta added to CLOCK_REALTIME is only 1ms the original time is
not restored and further tests are executed with this bias.
Diff:
---
sysdeps/unix/sysv/linux/Makefile | 4 +-
sysdeps/unix/sysv/linux/tst-clock_adjtime.c | 61 +++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 49934b26b4..97c99e378b 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -107,7 +107,9 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \
tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \
tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \
- tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes
+ tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes \
+ tst-clock_adjtime
+
tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc
CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables
diff --git a/sysdeps/unix/sysv/linux/tst-clock_adjtime.c b/sysdeps/unix/sysv/linux/tst-clock_adjtime.c
new file mode 100644
index 0000000000..ece68acc5f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-clock_adjtime.c
@@ -0,0 +1,61 @@
+/* Test for clock_adjtime
+ 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
+ <https://www.gnu.org/licenses/>. */
+
+#include <time.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/timex.h>
+#include <support/check.h>
+#include <support/xtime.h>
+
+static int
+do_test (void)
+{
+ struct timespec tv_then, tv_now;
+ struct timex delta;
+
+ /* Check if altering target time is allowed. */
+ if (getenv (SETTIME_ENV_NAME) == NULL)
+ FAIL_UNSUPPORTED ("clock_adjtime is executed only when "\
+ SETTIME_ENV_NAME" is set\n");
+
+ tv_then = xclock_now (CLOCK_REALTIME);
+
+ /* Setup time value to adjust - 1 ms. */
+ delta.time.tv_sec = 0;
+ delta.time.tv_usec = 1000;
+ delta.modes = ADJ_SETOFFSET;
+
+ int ret = clock_adjtime (CLOCK_REALTIME, &delta);
+ if (ret == -1)
+ FAIL_EXIT1 ("*** clock_adjtime failed: %m\n");
+
+ tv_now = xclock_now (CLOCK_REALTIME);
+
+ /* Check difference between timerfd_gettime calls. */
+ long long int diff = tv_now.tv_sec - tv_then.tv_sec;
+ diff *= 1000000000;
+ diff += tv_now.tv_nsec - tv_then.tv_nsec;
+ /* The adjustment cannot be large than 10 ms. */
+ if (diff > 10000000)
+ FAIL_EXIT1 ("clock_adjtime set wrong time!\n");
+
+ return 0;
+}
+
+#include <support/test-driver.c>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [glibc/azanella/y2038] tst: Add test for clock_adjtime
@ 2021-03-02 12:31 Adhemerval Zanella
0 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella @ 2021-03-02 12:31 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b769f35ed73681a493b51abb7099d703b3c466cf
commit b769f35ed73681a493b51abb7099d703b3c466cf
Author: Lukasz Majewski <lukma@denx.de>
Date: Wed Jan 20 12:10:42 2021 +0100
tst: Add test for clock_adjtime
This code brings test to check if time on target machine is properly
adjusted.
The time is altered only when cross-test-ssh.sh is executed with
--allow-time-setting flag
As the delta added to CLOCK_REALTIME is only 1ms the original time is
not restored and further tests are executed with this bias.
Diff:
---
sysdeps/unix/sysv/linux/Makefile | 2 +-
sysdeps/unix/sysv/linux/tst-clock_adjtime.c | 61 +++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 462240d629..e4345d0b52 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -107,7 +107,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \
tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \
tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \
- tst-timerfd tst-ppoll tst-futimens
+ tst-timerfd tst-ppoll tst-futimens tst-clock_adjtime
tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc
CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables
diff --git a/sysdeps/unix/sysv/linux/tst-clock_adjtime.c b/sysdeps/unix/sysv/linux/tst-clock_adjtime.c
new file mode 100644
index 0000000000..ece68acc5f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-clock_adjtime.c
@@ -0,0 +1,61 @@
+/* Test for clock_adjtime
+ 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
+ <https://www.gnu.org/licenses/>. */
+
+#include <time.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/timex.h>
+#include <support/check.h>
+#include <support/xtime.h>
+
+static int
+do_test (void)
+{
+ struct timespec tv_then, tv_now;
+ struct timex delta;
+
+ /* Check if altering target time is allowed. */
+ if (getenv (SETTIME_ENV_NAME) == NULL)
+ FAIL_UNSUPPORTED ("clock_adjtime is executed only when "\
+ SETTIME_ENV_NAME" is set\n");
+
+ tv_then = xclock_now (CLOCK_REALTIME);
+
+ /* Setup time value to adjust - 1 ms. */
+ delta.time.tv_sec = 0;
+ delta.time.tv_usec = 1000;
+ delta.modes = ADJ_SETOFFSET;
+
+ int ret = clock_adjtime (CLOCK_REALTIME, &delta);
+ if (ret == -1)
+ FAIL_EXIT1 ("*** clock_adjtime failed: %m\n");
+
+ tv_now = xclock_now (CLOCK_REALTIME);
+
+ /* Check difference between timerfd_gettime calls. */
+ long long int diff = tv_now.tv_sec - tv_then.tv_sec;
+ diff *= 1000000000;
+ diff += tv_now.tv_nsec - tv_then.tv_nsec;
+ /* The adjustment cannot be large than 10 ms. */
+ if (diff > 10000000)
+ FAIL_EXIT1 ("clock_adjtime set wrong time!\n");
+
+ return 0;
+}
+
+#include <support/test-driver.c>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [glibc/azanella/y2038] tst: Add test for clock_adjtime
@ 2021-03-01 17:36 Adhemerval Zanella
0 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella @ 2021-03-01 17:36 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a80710ce480c43f79464d72f5160419c72006bba
commit a80710ce480c43f79464d72f5160419c72006bba
Author: Lukasz Majewski <lukma@denx.de>
Date: Wed Jan 20 12:10:42 2021 +0100
tst: Add test for clock_adjtime
This code brings test to check if time on target machine is properly
adjusted.
The time is altered only when cross-test-ssh.sh is executed with
--allow-time-setting flag
As the delta added to CLOCK_REALTIME is only 1ms the original time is
not restored and further tests are executed with this bias.
Diff:
---
sysdeps/unix/sysv/linux/Makefile | 2 +-
sysdeps/unix/sysv/linux/tst-clock_adjtime.c | 61 +++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 462240d629..e4345d0b52 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -107,7 +107,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \
tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \
tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \
- tst-timerfd tst-ppoll tst-futimens
+ tst-timerfd tst-ppoll tst-futimens tst-clock_adjtime
tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc
CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables
diff --git a/sysdeps/unix/sysv/linux/tst-clock_adjtime.c b/sysdeps/unix/sysv/linux/tst-clock_adjtime.c
new file mode 100644
index 0000000000..ece68acc5f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-clock_adjtime.c
@@ -0,0 +1,61 @@
+/* Test for clock_adjtime
+ 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
+ <https://www.gnu.org/licenses/>. */
+
+#include <time.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/timex.h>
+#include <support/check.h>
+#include <support/xtime.h>
+
+static int
+do_test (void)
+{
+ struct timespec tv_then, tv_now;
+ struct timex delta;
+
+ /* Check if altering target time is allowed. */
+ if (getenv (SETTIME_ENV_NAME) == NULL)
+ FAIL_UNSUPPORTED ("clock_adjtime is executed only when "\
+ SETTIME_ENV_NAME" is set\n");
+
+ tv_then = xclock_now (CLOCK_REALTIME);
+
+ /* Setup time value to adjust - 1 ms. */
+ delta.time.tv_sec = 0;
+ delta.time.tv_usec = 1000;
+ delta.modes = ADJ_SETOFFSET;
+
+ int ret = clock_adjtime (CLOCK_REALTIME, &delta);
+ if (ret == -1)
+ FAIL_EXIT1 ("*** clock_adjtime failed: %m\n");
+
+ tv_now = xclock_now (CLOCK_REALTIME);
+
+ /* Check difference between timerfd_gettime calls. */
+ long long int diff = tv_now.tv_sec - tv_then.tv_sec;
+ diff *= 1000000000;
+ diff += tv_now.tv_nsec - tv_then.tv_nsec;
+ /* The adjustment cannot be large than 10 ms. */
+ if (diff > 10000000)
+ FAIL_EXIT1 ("clock_adjtime set wrong time!\n");
+
+ return 0;
+}
+
+#include <support/test-driver.c>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [glibc/azanella/y2038] tst: Add test for clock_adjtime
@ 2021-02-26 20:42 Adhemerval Zanella
0 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella @ 2021-02-26 20:42 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a5b344351312b6e10dda5aa6c33f272100d9e475
commit a5b344351312b6e10dda5aa6c33f272100d9e475
Author: Lukasz Majewski <lukma@denx.de>
Date: Wed Jan 20 12:10:42 2021 +0100
tst: Add test for clock_adjtime
This code brings test to check if time on target machine is properly
adjusted.
The time is altered only when cross-test-ssh.sh is executed with
--allow-time-setting flag
As the delta added to CLOCK_REALTIME is only 1ms the original time is
not restored and further tests are executed with this bias.
Diff:
---
sysdeps/unix/sysv/linux/Makefile | 2 +-
sysdeps/unix/sysv/linux/tst-clock_adjtime.c | 61 +++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 462240d629..e4345d0b52 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -107,7 +107,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \
tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \
tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \
- tst-timerfd tst-ppoll tst-futimens
+ tst-timerfd tst-ppoll tst-futimens tst-clock_adjtime
tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc
CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables
diff --git a/sysdeps/unix/sysv/linux/tst-clock_adjtime.c b/sysdeps/unix/sysv/linux/tst-clock_adjtime.c
new file mode 100644
index 0000000000..ece68acc5f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-clock_adjtime.c
@@ -0,0 +1,61 @@
+/* Test for clock_adjtime
+ 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
+ <https://www.gnu.org/licenses/>. */
+
+#include <time.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/timex.h>
+#include <support/check.h>
+#include <support/xtime.h>
+
+static int
+do_test (void)
+{
+ struct timespec tv_then, tv_now;
+ struct timex delta;
+
+ /* Check if altering target time is allowed. */
+ if (getenv (SETTIME_ENV_NAME) == NULL)
+ FAIL_UNSUPPORTED ("clock_adjtime is executed only when "\
+ SETTIME_ENV_NAME" is set\n");
+
+ tv_then = xclock_now (CLOCK_REALTIME);
+
+ /* Setup time value to adjust - 1 ms. */
+ delta.time.tv_sec = 0;
+ delta.time.tv_usec = 1000;
+ delta.modes = ADJ_SETOFFSET;
+
+ int ret = clock_adjtime (CLOCK_REALTIME, &delta);
+ if (ret == -1)
+ FAIL_EXIT1 ("*** clock_adjtime failed: %m\n");
+
+ tv_now = xclock_now (CLOCK_REALTIME);
+
+ /* Check difference between timerfd_gettime calls. */
+ long long int diff = tv_now.tv_sec - tv_then.tv_sec;
+ diff *= 1000000000;
+ diff += tv_now.tv_nsec - tv_then.tv_nsec;
+ /* The adjustment cannot be large than 10 ms. */
+ if (diff > 10000000)
+ FAIL_EXIT1 ("clock_adjtime set wrong time!\n");
+
+ return 0;
+}
+
+#include <support/test-driver.c>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [glibc/azanella/y2038] tst: Add test for clock_adjtime
@ 2021-02-23 12:37 Adhemerval Zanella
0 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella @ 2021-02-23 12:37 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=32cc899ed5123a1572cebd9c74092f3eed417b84
commit 32cc899ed5123a1572cebd9c74092f3eed417b84
Author: Lukasz Majewski <lukma@denx.de>
Date: Wed Jan 20 12:10:42 2021 +0100
tst: Add test for clock_adjtime
This code brings test to check if time on target machine is properly
adjusted.
The time is altered only when cross-test-ssh.sh is executed with
--allow-time-setting flag
As the delta added to CLOCK_REALTIME is only 1ms the original time is
not restored and further tests are executed with this bias.
Diff:
---
time/Makefile | 3 ++-
time/tst-clock_adjtime.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/time/Makefile b/time/Makefile
index b3c5368c3b..0d571fb777 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -48,7 +48,8 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \
tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3 \
tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 \
- tst-adjtime tst-ctime tst-difftime tst-mktime4 tst-clock_settime
+ tst-adjtime tst-ctime tst-difftime tst-mktime4 tst-clock_settime \
+ tst-clock_adjtime
include ../Rules
diff --git a/time/tst-clock_adjtime.c b/time/tst-clock_adjtime.c
new file mode 100644
index 0000000000..ece68acc5f
--- /dev/null
+++ b/time/tst-clock_adjtime.c
@@ -0,0 +1,61 @@
+/* Test for clock_adjtime
+ 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
+ <https://www.gnu.org/licenses/>. */
+
+#include <time.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/timex.h>
+#include <support/check.h>
+#include <support/xtime.h>
+
+static int
+do_test (void)
+{
+ struct timespec tv_then, tv_now;
+ struct timex delta;
+
+ /* Check if altering target time is allowed. */
+ if (getenv (SETTIME_ENV_NAME) == NULL)
+ FAIL_UNSUPPORTED ("clock_adjtime is executed only when "\
+ SETTIME_ENV_NAME" is set\n");
+
+ tv_then = xclock_now (CLOCK_REALTIME);
+
+ /* Setup time value to adjust - 1 ms. */
+ delta.time.tv_sec = 0;
+ delta.time.tv_usec = 1000;
+ delta.modes = ADJ_SETOFFSET;
+
+ int ret = clock_adjtime (CLOCK_REALTIME, &delta);
+ if (ret == -1)
+ FAIL_EXIT1 ("*** clock_adjtime failed: %m\n");
+
+ tv_now = xclock_now (CLOCK_REALTIME);
+
+ /* Check difference between timerfd_gettime calls. */
+ long long int diff = tv_now.tv_sec - tv_then.tv_sec;
+ diff *= 1000000000;
+ diff += tv_now.tv_nsec - tv_then.tv_nsec;
+ /* The adjustment cannot be large than 10 ms. */
+ if (diff > 10000000)
+ FAIL_EXIT1 ("clock_adjtime set wrong time!\n");
+
+ return 0;
+}
+
+#include <support/test-driver.c>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-03-04 17:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-23 20:40 [glibc/azanella/y2038] tst: Add test for clock_adjtime Adhemerval Zanella
-- strict thread matches above, loose matches on Subject: below --
2021-03-04 17:37 Adhemerval Zanella
2021-03-04 11:30 Adhemerval Zanella
2021-03-02 12:31 Adhemerval Zanella
2021-03-01 17:36 Adhemerval Zanella
2021-02-26 20:42 Adhemerval Zanella
2021-02-23 12:37 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).