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