selftests: timers: drop support for !KTEST case

There is no need to keep timers tests in sync with external timers
repo. Drop support for !KTEST to support for building and running
timers tests without kselftest framework.

Reference: https://lkml.org/lkml/2017/8/10/952
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Acked-by: John Stultz <john.stultz@linaro.org>

diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile
index a9b86133b9b3986ff3617e4e9e0a6c45f1ee16bb..c805ab048d26cbb09ab957836ab73a08e4849c6f 100644 (file)
--- a/tools/testing/selftests/timers/Makefile
+++ b/tools/testing/selftests/timers/Makefile
@@ -1,5 +1,4 @@
-BUILD_FLAGS = -DKTEST
-CFLAGS += -O3 -Wl,-no-as-needed -Wall $(BUILD_FLAGS)
+CFLAGS += -O3 -Wl,-no-as-needed -Wall
 LDFLAGS += -lrt -lpthread -lm
 
 # these are all "safe" tests that don't modify

diff --git a/tools/testing/selftests/timers/adjtick.c b/tools/testing/selftests/timers/adjtick.c
index 9887fd538fec0d601342ac5b5f173292d77a8722..0caca3a06bd26eebdff08ce7700aff14f58eb558 100644 (file)
--- a/tools/testing/selftests/timers/adjtick.c
+++ b/tools/testing/selftests/timers/adjtick.c
@@ -23,18 +23,7 @@
 #include <sys/timex.h>
 #include <time.h>
 
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define CLOCK_MONOTONIC_RAW    4
 

diff --git a/tools/testing/selftests/timers/alarmtimer-suspend.c b/tools/testing/selftests/timers/alarmtimer-suspend.c
index 2b361b8303955b6fa91e9844586ae84843203056..4da09dbf83ba8e18aebfe8ddf3a09289bdf2d8a8 100644 (file)
--- a/tools/testing/selftests/timers/alarmtimer-suspend.c
+++ b/tools/testing/selftests/timers/alarmtimer-suspend.c
@@ -28,18 +28,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <pthread.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define CLOCK_REALTIME                 0
 #define CLOCK_MONOTONIC                        1

diff --git a/tools/testing/selftests/timers/change_skew.c b/tools/testing/selftests/timers/change_skew.c
index cb1968977c04db7ecb7b58da665c17e44df76b0d..c4eab7124990ce1b8fe2a541ff2077b7b37ebe90 100644 (file)
--- a/tools/testing/selftests/timers/change_skew.c
+++ b/tools/testing/selftests/timers/change_skew.c
@@ -28,18 +28,7 @@
 #include <sys/time.h>
 #include <sys/timex.h>
 #include <time.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define NSEC_PER_SEC 1000000000LL
 

diff --git a/tools/testing/selftests/timers/clocksource-switch.c b/tools/testing/selftests/timers/clocksource-switch.c
index 5ff165373f8ba1b51502ca28a7d0324dc671a4e9..3ef214628067881ac46a4c755eb493bd315c5d28 100644 (file)
--- a/tools/testing/selftests/timers/clocksource-switch.c
+++ b/tools/testing/selftests/timers/clocksource-switch.c
@@ -34,18 +34,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <sys/wait.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 
 int get_clocksources(char list[][30])

diff --git a/tools/testing/selftests/timers/inconsistency-check.c b/tools/testing/selftests/timers/inconsistency-check.c
index 74c60e8759a017dee58604860e111c8cfb5a2e76..022d3ffe3fbffbdfe87b217063e77ccf1716948b 100644 (file)
--- a/tools/testing/selftests/timers/inconsistency-check.c
+++ b/tools/testing/selftests/timers/inconsistency-check.c
@@ -28,18 +28,7 @@
 #include <sys/timex.h>
 #include <string.h>
 #include <signal.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define CALLS_PER_LOOP 64
 #define NSEC_PER_SEC 1000000000ULL

diff --git a/tools/testing/selftests/timers/leap-a-day.c b/tools/testing/selftests/timers/leap-a-day.c
index fb46ad6ac92cadc71254c68c80953eeae51b218b..a13d2cd324c3643c6412c6b1f23595480b3e6740 100644 (file)
--- a/tools/testing/selftests/timers/leap-a-day.c
+++ b/tools/testing/selftests/timers/leap-a-day.c
@@ -48,18 +48,7 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define NSEC_PER_SEC 1000000000ULL
 #define CLOCK_TAI 11

diff --git a/tools/testing/selftests/timers/leapcrash.c b/tools/testing/selftests/timers/leapcrash.c
index a1071bdbdeb7608afea5d2c653cc59d591004a08..830c462f605d9476b712f909db2a62c09e053959 100644 (file)
--- a/tools/testing/selftests/timers/leapcrash.c
+++ b/tools/testing/selftests/timers/leapcrash.c
@@ -22,20 +22,7 @@
 #include <sys/timex.h>
 #include <string.h>
 #include <signal.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
-
-
 
 /* clear NTP time_status & time_state */
 int clear_time_state(void)

diff --git a/tools/testing/selftests/timers/mqueue-lat.c b/tools/testing/selftests/timers/mqueue-lat.c
index a2a3924d0b41f2936822e20d3b3613a41b617f1b..1867db5d6f5e0fcf9a9f494e54a570dc07aae0d6 100644 (file)
--- a/tools/testing/selftests/timers/mqueue-lat.c
+++ b/tools/testing/selftests/timers/mqueue-lat.c
@@ -29,18 +29,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <mqueue.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define NSEC_PER_SEC 1000000000ULL
 

diff --git a/tools/testing/selftests/timers/nanosleep.c b/tools/testing/selftests/timers/nanosleep.c
index ff942ff7c9b367e8e306d6730c01fe92b1abd882..8adb0bb51d4da4a1ab4eddde5d15be21a5ffcfb1 100644 (file)
--- a/tools/testing/selftests/timers/nanosleep.c
+++ b/tools/testing/selftests/timers/nanosleep.c
@@ -27,18 +27,7 @@
 #include <sys/timex.h>
 #include <string.h>
 #include <signal.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define NSEC_PER_SEC 1000000000ULL
 

diff --git a/tools/testing/selftests/timers/nsleep-lat.c b/tools/testing/selftests/timers/nsleep-lat.c
index 2d7898fda0f1d3c8d012d66b2d8ba73fbbe728d5..c3c3dc10db17fe1493994fa2209bd06ce35b94fb 100644 (file)
--- a/tools/testing/selftests/timers/nsleep-lat.c
+++ b/tools/testing/selftests/timers/nsleep-lat.c
@@ -24,18 +24,7 @@
 #include <sys/timex.h>
 #include <string.h>
 #include <signal.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define NSEC_PER_SEC 1000000000ULL
 

diff --git a/tools/testing/selftests/timers/raw_skew.c b/tools/testing/selftests/timers/raw_skew.c
index 30906bfd9c1b582636a3ff85a5abd1d1bfb187a9..ca6cd146aafe15420cb345ef3ba934dd21e13220 100644 (file)
--- a/tools/testing/selftests/timers/raw_skew.c
+++ b/tools/testing/selftests/timers/raw_skew.c
@@ -25,19 +25,7 @@
 #include <sys/time.h>
 #include <sys/timex.h>
 #include <time.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
-
 
 #define CLOCK_MONOTONIC_RAW            4
 #define NSEC_PER_SEC 1000000000LL

diff --git a/tools/testing/selftests/timers/set-2038.c b/tools/testing/selftests/timers/set-2038.c
index c8a7e14446b19e0550138abd4f8c0405f27ad897..688cfd81b5319f482328a015810a93d1a6707c45 100644 (file)
--- a/tools/testing/selftests/timers/set-2038.c
+++ b/tools/testing/selftests/timers/set-2038.c
@@ -27,18 +27,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <sys/time.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define NSEC_PER_SEC 1000000000LL
 

diff --git a/tools/testing/selftests/timers/set-tai.c b/tools/testing/selftests/timers/set-tai.c
index dc88dbc8831f18cd2c6e08cade6f33348199b2d3..70fed27d8fd3cf8db9401542759ed53946e3e512 100644 (file)
--- a/tools/testing/selftests/timers/set-tai.c
+++ b/tools/testing/selftests/timers/set-tai.c
@@ -23,18 +23,7 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 int set_tai(int offset)
 {

diff --git a/tools/testing/selftests/timers/set-timer-lat.c b/tools/testing/selftests/timers/set-timer-lat.c
index 4fc98c5b089972fadc77fea1c6d212b2685d4569..b343ac90b59894dc07cb7f997ac6d7e307725709 100644 (file)
--- a/tools/testing/selftests/timers/set-timer-lat.c
+++ b/tools/testing/selftests/timers/set-timer-lat.c
@@ -27,18 +27,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <pthread.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define CLOCK_REALTIME                 0
 #define CLOCK_MONOTONIC                        1

diff --git a/tools/testing/selftests/timers/set-tz.c b/tools/testing/selftests/timers/set-tz.c
index f4184928b16bc38ca845be32908f48d302702856..877fd5532fee03ee9fe25bed1505fcedf78dde60 100644 (file)
--- a/tools/testing/selftests/timers/set-tz.c
+++ b/tools/testing/selftests/timers/set-tz.c
@@ -23,18 +23,7 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 int set_tz(int min, int dst)
 {

diff --git a/tools/testing/selftests/timers/skew_consistency.c b/tools/testing/selftests/timers/skew_consistency.c
index 2a996e0722594a6001e339bc00458fb13878709d..022b711c78ee51303dd33399753f61e8b26929d0 100644 (file)
--- a/tools/testing/selftests/timers/skew_consistency.c
+++ b/tools/testing/selftests/timers/skew_consistency.c
@@ -35,18 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define NSEC_PER_SEC 1000000000LL
 

diff --git a/tools/testing/selftests/timers/threadtest.c b/tools/testing/selftests/timers/threadtest.c
index e632e116f05e7e679f38a091072c3acf1d0954fe..759c9c06f1a034d4a566d81c1fb556f0c46bceff 100644 (file)
--- a/tools/testing/selftests/timers/threadtest.c
+++ b/tools/testing/selftests/timers/threadtest.c
@@ -21,19 +21,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <pthread.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
-
 
 /* serializes shared list access */
 pthread_mutex_t list_lock = PTHREAD_MUTEX_INITIALIZER;

diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c
index 60fe3c569bd90f9cbfdc9664720c598e9430e8a3..d9d3ab93b31a75a766bb8c1cbf8e30ce2c24bed3 100644 (file)
--- a/tools/testing/selftests/timers/valid-adjtimex.c
+++ b/tools/testing/selftests/timers/valid-adjtimex.c
@@ -32,18 +32,7 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
-#ifdef KTEST
 #include "../kselftest.h"
-#else
-static inline int ksft_exit_pass(void)
-{
-       exit(0);
-}
-static inline int ksft_exit_fail(void)
-{
-       exit(1);
-}
-#endif
 
 #define NSEC_PER_SEC 1000000000LL
 #define USEC_PER_SEC 1000000LL