Move resolver_test.cpp from netd_integration_test to a new resolv_integration_test
1. make resolver_test.cpp as an independent integration test
2. rename libnetd_resolv_test to resolv_unit_test
Test: manually make and run:
- netd_integration_test
- resolv_integration_test
- resolv_unit_test
Test: run runtests.sh, make sure no missing test and get all pass
Test: atest resolv_integration_test
Change-Id: I29a115444d7955c5b6239df80481e29cd3f0e686
diff --git a/resolv/Android.bp b/resolv/Android.bp
index 616e5d1..e3e4f19 100644
--- a/resolv/Android.bp
+++ b/resolv/Android.bp
@@ -46,7 +46,45 @@
}
cc_test {
- name: "libnetd_resolv_test",
+ name: "resolv_integration_test",
+ test_suites: ["device-tests"],
+ defaults: ["netd_defaults"],
+ srcs: [
+ ":netd_metrics_aidl",
+ "dns_responder/dns_responder.cpp",
+ "resolver_test.cpp",
+ ],
+ include_dirs: [
+ "system/netd/resolv/include",
+ "system/netd/server",
+ ],
+ shared_libs: [
+ "libbase",
+ "libbinder",
+ "libcrypto",
+ "liblog",
+ "libnetd_client",
+ "libssl",
+ "libutils",
+ "netd_aidl_interface-cpp",
+ ],
+ static_libs: [
+ "libnetd_test_dnsresponder",
+ "libnetd_test_tun_interface",
+ "liblogwrap",
+ "libnetdaidl",
+ "libnetdutils",
+ "netd_aidl_interface-cpp",
+ ],
+ compile_multilib: "both",
+ sanitize: {
+ address: true,
+ recover: [ "all" ],
+ },
+}
+
+cc_test {
+ name: "resolv_unit_test",
defaults: ["netd_defaults"],
// Add DnsTls* files since they are not visible outside libnetd_resolv library.
srcs: [
diff --git a/tests/dns_responder/Android.bp b/resolv/dns_responder/Android.bp
similarity index 83%
rename from tests/dns_responder/Android.bp
rename to resolv/dns_responder/Android.bp
index 727d7c4..1c9e1f3 100644
--- a/tests/dns_responder/Android.bp
+++ b/resolv/dns_responder/Android.bp
@@ -23,11 +23,7 @@
],
},
include_dirs: [
- "system/netd/include",
- "system/netd/resolv",
"system/netd/server",
- "system/netd/server/binder",
- "system/netd/tests/dns_responder",
],
srcs: [
"dns_responder.cpp",
diff --git a/tests/dns_responder/dns_responder.cpp b/resolv/dns_responder/dns_responder.cpp
similarity index 100%
rename from tests/dns_responder/dns_responder.cpp
rename to resolv/dns_responder/dns_responder.cpp
diff --git a/tests/dns_responder/dns_responder.h b/resolv/dns_responder/dns_responder.h
similarity index 100%
rename from tests/dns_responder/dns_responder.h
rename to resolv/dns_responder/dns_responder.h
diff --git a/tests/dns_responder/dns_responder_client.cpp b/resolv/dns_responder/dns_responder_client.cpp
similarity index 100%
rename from tests/dns_responder/dns_responder_client.cpp
rename to resolv/dns_responder/dns_responder_client.cpp
diff --git a/tests/dns_responder/dns_responder_client.h b/resolv/dns_responder/dns_responder_client.h
similarity index 100%
rename from tests/dns_responder/dns_responder_client.h
rename to resolv/dns_responder/dns_responder_client.h
diff --git a/tests/dns_responder/dns_tls_frontend.cpp b/resolv/dns_responder/dns_tls_frontend.cpp
similarity index 100%
rename from tests/dns_responder/dns_tls_frontend.cpp
rename to resolv/dns_responder/dns_tls_frontend.cpp
diff --git a/tests/dns_responder/dns_tls_frontend.h b/resolv/dns_responder/dns_tls_frontend.h
similarity index 100%
rename from tests/dns_responder/dns_tls_frontend.h
rename to resolv/dns_responder/dns_tls_frontend.h
diff --git a/tests/resolver_test.cpp b/resolv/resolver_test.cpp
similarity index 99%
rename from tests/resolver_test.cpp
rename to resolv/resolver_test.cpp
index 5196bba..8ebffca 100644
--- a/tests/resolver_test.cpp
+++ b/resolv/resolver_test.cpp
@@ -41,9 +41,9 @@
#include "netid_client.h" // NETID_UNSET
#include "netd_resolv/params.h" // MAX_NS
-#include "dns_responder.h"
-#include "dns_responder_client.h"
-#include "dns_tls_frontend.h"
+#include "dns_responder/dns_responder.h"
+#include "dns_responder/dns_responder_client.h"
+#include "dns_responder/dns_tls_frontend.h"
#include "NetdConstants.h"
#include "ResolverStats.h"
diff --git a/tests/Android.bp b/tests/Android.bp
index 5b35fdc..80f5217 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -35,16 +35,10 @@
":netd_metrics_aidl",
"binder_test.cpp",
"bpf_base_test.cpp",
- "dns_responder/dns_responder.cpp",
"netd_test.cpp",
- "resolver_test.cpp",
"netlink_listener_test.cpp",
],
- include_dirs: [
- "system/netd/resolv/include",
- "system/netd/server",
- "system/netd/tests/dns_responder",
- ],
+ include_dirs: ["system/netd/server"],
shared_libs: [
"libbase",
"libbinder",
@@ -60,7 +54,6 @@
],
static_libs: [
"libcap",
- "libnetd_test_dnsresponder",
"libnetd_test_tun_interface",
"libbpf_android",
"liblogwrap",
diff --git a/tests/benchmarks/Android.bp b/tests/benchmarks/Android.bp
index d2079c1..afed8d7 100644
--- a/tests/benchmarks/Android.bp
+++ b/tests/benchmarks/Android.bp
@@ -24,7 +24,7 @@
"system/netd/resolv/include",
"system/netd/server",
"system/netd/server/binder",
- "system/netd/tests/dns_responder",
+ "system/netd/resolv/dns_responder",
],
srcs: [
":netd_metrics_aidl",
diff --git a/tests/runtests.sh b/tests/runtests.sh
index d59dd19..a221116 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -7,7 +7,8 @@
netdutils_test
netd_unit_test
netd_integration_test
- libnetd_resolv_test
+ resolv_integration_test
+ resolv_unit_test
"
readonly EXTENDED_TESTS="