[CRIU] [PATCH] test: posix_timers -- Disable boottime test for a while
Cyrill Gorcunov
gorcunov at openvz.org
Fri Feb 27 06:54:05 PST 2015
We don't have proper support of sleeping time tracking
so that it might fail if migration takes too much time.
Disable it for a while.
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
test/zdtm/live/static/Makefile | 1 +
test/zdtm/live/static/posix_timers.c | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile
index 418e138b3f14..48f785c51e70 100644
--- a/test/zdtm/live/static/Makefile
+++ b/test/zdtm/live/static/Makefile
@@ -293,6 +293,7 @@ sigaltstack: override LDLIBS += -pthread
shm: override CFLAGS += -DNEW_IPC_NS
msgque: override CFLAGS += -DNEW_IPC_NS
sem: override CFLAGS += -DNEW_IPC_NS
+posix_timers: override CFLAGS += -DNO_BOOTTIME
posix_timers: override LDLIBS += -lrt -pthread
socket-tcp6: override CFLAGS += -D ZDTM_IPV6
socket-tcpbuf6: override CFLAGS += -D ZDTM_IPV6
diff --git a/test/zdtm/live/static/posix_timers.c b/test/zdtm/live/static/posix_timers.c
index a0bdc542647f..1d75fed57492 100644
--- a/test/zdtm/live/static/posix_timers.c
+++ b/test/zdtm/live/static/posix_timers.c
@@ -31,11 +31,15 @@ sigset_t mask;
#ifndef NO_PERIODIC
static void realtime_periodic_handler(int sig, siginfo_t *si, void *uc);
static void monotonic_periodic_handler(int sig, siginfo_t *si, void *uc);
+#ifndef NO_BOOTTIME
static void boottime_periodic_handler(int sig, siginfo_t *si, void *uc);
#endif
+#endif
static void realtime_oneshot_handler(int sig, siginfo_t *si, void *uc);
static void monotonic_oneshot_handler(int sig, siginfo_t *si, void *uc);
+#ifndef NO_BOOTTIME
static void boottime_oneshot_handler(int sig, siginfo_t *si, void *uc);
+#endif
enum {
#ifndef NO_PERIODIC
@@ -79,6 +83,7 @@ static struct posix_timers_info {
.oneshot = 0,
.ms_int = 3,
},
+#ifndef NO_BOOTTIME
[BOOTTIME_PERIODIC_INFO] = {
.clock = CLOCK_BOOTTIME,
.name = "BOOTTIME (periodic)",
@@ -88,6 +93,7 @@ static struct posix_timers_info {
.ms_int = 3,
},
#endif
+#endif
[REALTIME_ONESHOT_INFO] = {
.clock = CLOCK_REALTIME,
.name = "REALTIME (oneshot)",
@@ -104,6 +110,7 @@ static struct posix_timers_info {
.oneshot = 1,
.ms_int = INT_MAX,
},
+#ifndef NO_BOOTTIME
[BOOTTIME_ONESHOT_INFO] = {
.clock = CLOCK_BOOTTIME,
.name = "BOOTTIME (oneshot)",
@@ -112,6 +119,7 @@ static struct posix_timers_info {
.oneshot = 1,
.ms_int = INT_MAX,
},
+#endif
{ }
};
@@ -260,12 +268,14 @@ static void monotonic_periodic_handler(int sig, siginfo_t *si, void *uc)
&posix_timers[MONOTONIC_PERIODIC_INFO], sig);
}
+#ifndef NO_BOOTTIME
static void boottime_periodic_handler(int sig, siginfo_t *si, void *uc)
{
generic_handler(si->si_value.sival_ptr,
&posix_timers[BOOTTIME_PERIODIC_INFO], sig);
}
#endif
+#endif
static void monotonic_oneshot_handler(int sig, siginfo_t *si, void *uc)
{
@@ -273,11 +283,13 @@ static void monotonic_oneshot_handler(int sig, siginfo_t *si, void *uc)
&posix_timers[MONOTONIC_ONESHOT_INFO], sig);
}
+#ifndef NO_BOOTTIME
static void boottime_oneshot_handler(int sig, siginfo_t *si, void *uc)
{
generic_handler(si->si_value.sival_ptr,
&posix_timers[BOOTTIME_ONESHOT_INFO], sig);
}
+#endif
#ifndef NO_PERIODIC
static void realtime_periodic_handler(int sig, siginfo_t *si, void *uc)
--
1.9.3
More information about the CRIU
mailing list