aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Muckle <smuckle@google.com>2018-02-02 09:35:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-02 09:35:14 +0000
commitd80931e0aae7a86299bbd0e38afec3e573f3b7bd (patch)
tree23d055141a61a9dc7d5c1373239395188a686a88
parentd6a92f0c3c1cc8639368479d1b9ae944198762e8 (diff)
parentf9bed7afafd94c55af4199977386d72d1ce9dc38 (diff)
downloadlinux-kselftest-d80931e0aae7a86299bbd0e38afec3e573f3b7bd.tar.gz
am: f9bed7afaf Change-Id: Ia56e579f8e4a1b1262f9af4017a1ae59f77e0d1a
-rw-r--r--Android.bp1
-rw-r--r--android/kselftest_test_list.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index bd9c746f273c..01e452a422b1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -200,6 +200,7 @@ cc_test {
"tools/testing/selftests/net/psock_fanout.c",
"tools/testing/selftests/net/psock_tpacket.c",
"tools/testing/selftests/net/reuseport_dualstack.c",
+ "tools/testing/selftests/net/reuseaddr_conflict.c",
],
defaults: ["kselftest_defaults"],
// TODO: test_data: net/test_bpf.sh
diff --git a/android/kselftest_test_list.mk b/android/kselftest_test_list.mk
index f8c4cf9e722a..9f1ec1a68e34 100644
--- a/android/kselftest_test_list.mk
+++ b/android/kselftest_test_list.mk
@@ -32,6 +32,7 @@ kselftest_modules += \
kselftest_kcmp_tests_kcmp_test \
kselftest_net_tests_psock_tpacket \
kselftest_net_tests_socket \
+ kselftest_net_tests_reuseaddr_conflict \
kselftest_ptrace_tests_peeksiginfo \
kselftest_seccomp_tests_seccomp_bpf \
kselftest_size_test_get_size \