Merge "Revert "Read test cacert and keys from files"" am: 95450851b4 am: 2f013de16d (9d67ec42) · Commits · e / os / android_packages_modules_DnsResolver

Android.bp

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -147,9 +147,6 @@ cc_defaults {
	suffix: "64",		suffix: "64",
	},		},
	},		},
	data: [
	":resolv_test_keys",
	],
	}		}

	cc_library {		cc_library {

resolv_test_config_template.xml

+0 −12

Original line number	Original line	Diff line number	Diff line
	@@ -28,18 +28,6 @@
	<option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />		<option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />
	<option name="append-bitness" value="true" />		<option name="append-bitness" value="true" />
	</target_preparer>		</target_preparer>

	<!-- For test files which are not renamed with bitness appended -->
	<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
	<option name="cleanup" value="true" />
	<option name="push"
	value="server_certificate.pem->/data/local/tmp/test_keys/server_certificate.pem" />
	<option name="push" value="server_key.pem->/data/local/tmp/test_keys/server_key.pem" />
	<option name="push"
	value="ca_certificate.pem->/data/local/tmp/test_keys/ca_certificate.pem" />
	<option name="append-bitness" value="false" />
	</target_preparer>

	<test class="com.android.tradefed.testtype.GTest" >		<test class="com.android.tradefed.testtype.GTest" >
	<option name="native-test-device-path" value="/data/local/tmp" />		<option name="native-test-device-path" value="/data/local/tmp" />
	<option name="module-name" value="{MODULE}" />		<option name="module-name" value="{MODULE}" />

tests/Android.bp

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -89,10 +89,7 @@ cc_test {
	// TODO: Remove the xml after MTS fixing the problem.		// TODO: Remove the xml after MTS fixing the problem.
	test_config: "resolv_gold_test_config.xml",		test_config: "resolv_gold_test_config.xml",
	defaults: ["netd_defaults", "resolv_test_defaults"],		defaults: ["netd_defaults", "resolv_test_defaults"],
	data: [		data: [":resolv_gold_test_pbtxt2pb"],
	":resolv_gold_test_pbtxt2pb",
	":resolv_test_keys",
	],
	srcs: [		srcs: [
	"resolv_gold_test.cpp",		"resolv_gold_test.cpp",
	],		],
	@@ -191,9 +188,6 @@ cc_test {
	"libipchecksum",		"libipchecksum",
	"resolv_unsolicited_listener",		"resolv_unsolicited_listener",
	],		],
	data: [
	":resolv_test_keys",
	],
	// This test talks to the DnsResolver module over a binary protocol on a socket, so keep it as		// This test talks to the DnsResolver module over a binary protocol on a socket, so keep it as
	// multilib setting is worth because we might be able to get some coverage for the case where		// multilib setting is worth because we might be able to get some coverage for the case where
	// 32bit apps talk to 64bit resolvers.		// 32bit apps talk to 64bit resolvers.

tests/dns_responder/Android.bp

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -33,12 +33,6 @@ cc_test_library {
	"dns_responder.cpp",		"dns_responder.cpp",
	"dns_responder_client_ndk.cpp",		"dns_responder_client_ndk.cpp",
	"dns_tls_frontend.cpp",		"dns_tls_frontend.cpp",
	"dns_tls_certificate.cpp",
	],		],
	export_include_dirs: ["."],		export_include_dirs: ["."],
	}		}

	filegroup {
	name: "resolv_test_keys",
	srcs: ["test_keys/*.pem"],
	}

tests/dns_responder/dns_responder_client_ndk.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -133,7 +133,7 @@ bool DnsResponderClient::SetResolversWithTls(const std::vector<std::string>& ser
	const std::vector<std::string>& tlsServers,		const std::vector<std::string>& tlsServers,
	const std::string& name) {		const std::string& name) {
	const auto& resolverParams = makeResolverParamsParcel(TEST_NETID, params, servers, domains,		const auto& resolverParams = makeResolverParamsParcel(TEST_NETID, params, servers, domains,
	name, tlsServers, sCaCert);		name, tlsServers, kCaCert);
	const auto rv = mDnsResolvSrv->setResolverConfiguration(resolverParams);		const auto rv = mDnsResolvSrv->setResolverConfiguration(resolverParams);
	if (!rv.isOk()) LOG(ERROR) << "SetResolversWithTls() -> " << rv.getMessage();		if (!rv.isOk()) LOG(ERROR) << "SetResolversWithTls() -> " << rv.getMessage();
	return rv.isOk();		return rv.isOk();
	@@ -148,7 +148,7 @@ bool DnsResponderClient::SetResolversFromParcel(const ResolverParamsParcel& reso
	ResolverParamsParcel DnsResponderClient::GetDefaultResolverParamsParcel() {		ResolverParamsParcel DnsResponderClient::GetDefaultResolverParamsParcel() {
	return makeResolverParamsParcel(TEST_NETID, kDefaultParams, kDefaultServers,		return makeResolverParamsParcel(TEST_NETID, kDefaultParams, kDefaultServers,
	kDefaultSearchDomains, {} /* tlsHostname */, kDefaultServers,		kDefaultSearchDomains, {} /* tlsHostname */, kDefaultServers,
	sCaCert);		kCaCert);
	}		}

	void DnsResponderClient::SetupDNSServers(unsigned numServers, const std::vector<Mapping>& mappings,		void DnsResponderClient::SetupDNSServers(unsigned numServers, const std::vector<Mapping>& mappings,