diff options
| author | Maciej Żenczykowski <maze@google.com> | 2021-03-12 20:18:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-12 20:18:31 +0000 |
| commit | 72800649a8889c0cb32e06489590ce88218e29e4 (patch) | |
| tree | d74ea5c0fcd92cc80364d3ca1c5c50c9691b620a | |
| parent | 6d14bb36b24e56b8bb7cfd514c641e0a355d6b7e (diff) | |
| parent | 80fdd8c233e0af8d9cf438f6a16dc29db7f0cd0d (diff) | |
| download | DnsResolver-72800649a8889c0cb32e06489590ce88218e29e4.tar.gz | |
Merge "Skip the tests relevant to bpf if bpf is not supported"
| -rw-r--r-- | tests/Android.bp | 1 | ||||
| -rw-r--r-- | tests/resolv_integration_test.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index 6aa2a384..b6e82a38 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -174,6 +174,7 @@ cc_test { ], static_libs: [ "dnsresolver_aidl_interface-lateststable-ndk_platform", + "libbpf_android", "libcrypto_static", "libgmock", "libnetd_test_dnsresponder_ndk", diff --git a/tests/resolv_integration_test.cpp b/tests/resolv_integration_test.cpp index a1b93b8b..e94e3322 100644 --- a/tests/resolv_integration_test.cpp +++ b/tests/resolv_integration_test.cpp @@ -58,6 +58,7 @@ #include <aidl/android/net/IDnsResolver.h> #include <android/binder_manager.h> #include <android/binder_process.h> +#include <bpf/BpfUtils.h> #include <util.h> // getApiLevel #include "NetdClient.h" #include "ResolverStats.h" @@ -4201,6 +4202,7 @@ TEST_F(ResolverTest, getDnsNetId) { } TEST_F(ResolverTest, BlockDnsQueryWithUidRule) { + SKIP_IF_BPF_NOT_SUPPORTED; constexpr char listen_addr1[] = "127.0.0.4"; constexpr char listen_addr2[] = "::1"; constexpr char host_name[] = "howdy.example.com."; @@ -4248,6 +4250,7 @@ TEST_F(ResolverTest, BlockDnsQueryWithUidRule) { } TEST_F(ResolverTest, EnforceDnsUid) { + SKIP_IF_BPF_NOT_SUPPORTED; constexpr char listen_addr1[] = "127.0.0.4"; constexpr char listen_addr2[] = "::1"; constexpr char host_name[] = "howdy.example.com."; @@ -5403,6 +5406,7 @@ TEST_F(ResolverTest, GetAddrInfoParallelLookupSleepTime) { } TEST_F(ResolverTest, BlockDnsQueryUidDoesNotLeadToBadServer) { + SKIP_IF_BPF_NOT_SUPPORTED; constexpr char listen_addr1[] = "127.0.0.4"; constexpr char listen_addr2[] = "::1"; test::DNSResponder dns1(listen_addr1); @@ -6027,6 +6031,7 @@ TEST_F(ResolverMultinetworkTest, OneCachePerNetwork) { } TEST_F(ResolverMultinetworkTest, DnsWithVpn) { + SKIP_IF_BPF_NOT_SUPPORTED; SKIP_IF_REMOTE_VERSION_LESS_THAN(mDnsClient.resolvService(), 4); constexpr char host_name[] = "ohayou.example.com."; constexpr char ipv4_addr[] = "192.0.2.0"; |