1 From cd038753c3543ee6919469a4472cdf86ea0121c8 Mon Sep 17 00:00:00 2001 2 From: Tri Vo <trong (a] google.com> 3 Date: Sun, 28 Aug 2016 16:55:24 -0700 4 Subject: [PATCH] Removes unsupported testcases for ftrace, compiles 5 membarrier, net/psock_tpacket, timers/valid-adjtimex. Added a list of 6 testfiles that could potentially be compiled in Android.kselftest.mk. 7 8 Change-Id: I5162512d4166a523ef8f23c23b59cb1275b29748 9 --- 10 11 [smuckle (a] google.com: drop changes to Android-specific files for 12 tracking of changes to upstream] 13 14 tools/testing/selftests/net/psock_tpacket.c | 2 + 15 tools/testing/selftests/timers/valid-adjtimex.c | 5 +- 16 17 diff --git a/tools/testing/selftests/net/psock_tpacket.c b/tools/testing/selftests/net/psock_tpacket.c 18 index 24adf709bd9d..7a1bb6f8c2a2 100644 19 --- a/tools/testing/selftests/net/psock_tpacket.c 20 +++ b/tools/testing/selftests/net/psock_tpacket.c 21 @@ -47,7 +47,9 @@ 22 #include <ctype.h> 23 #include <fcntl.h> 24 #include <unistd.h> 25 +#ifndef __ANDROID__ 26 #include <bits/wordsize.h> 27 +#endif 28 #include <net/ethernet.h> 29 #include <netinet/ip.h> 30 #include <arpa/inet.h> 31 diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c 32 index 60fe3c569bd9..aeade9f975ea 100644 33 --- a/tools/testing/selftests/timers/valid-adjtimex.c 34 +++ b/tools/testing/selftests/timers/valid-adjtimex.c 35 @@ -50,12 +50,13 @@ static inline int ksft_exit_fail(void) 36 37 #define ADJ_SETOFFSET 0x0100 38 39 +#ifndef __ANDROID__ 40 #include <sys/syscall.h> 41 static int clock_adjtime(clockid_t id, struct timex *tx) 42 { 43 - return syscall(__NR_clock_adjtime, id, tx); 44 + return syscall(__NR_clock_adjtime, id, tx); 45 } 46 - 47 +#endif 48 49 /* clear NTP time_status & time_state */ 50 int clear_time_state(void) 51 -- 52 2.13.1.518.g3df882009-goog 53 54
