aconfig: restructure integration tests
Consolidate integration tests under tests/. Rename build targets to follow the same pattern. The important aconfig build targets are: - aconfig : the aconfig binary - aconfig.test : the aconfig unit tests - aconfig.test.java : the Java integration tests - aconfig.test.cpp : the C++ integration tests - aconfig.test.rust : the Rust integration tests (not implemented yet) Note: the Rust integration tests are blocked until the build system has added support for aconfig Rust libraries. Note: the flags used in the integration are not set correctly. A follow-up CL will fix this. Bug: 283911467 Test: atest aconfig.test.java aconfig.test.cpp Change-Id: Idb8dad4c38a49231c2e89228775bacf065ee1f57
This commit is contained in:
@@ -67,7 +67,7 @@ rust_test_host {
|
||||
],
|
||||
}
|
||||
|
||||
// integration tests: java
|
||||
// integration tests: general
|
||||
|
||||
aconfig_declarations {
|
||||
name: "aconfig.test.flags",
|
||||
@@ -91,8 +91,10 @@ aconfig_value_set {
|
||||
],
|
||||
}
|
||||
|
||||
// integration tests: java
|
||||
|
||||
java_aconfig_library {
|
||||
name: "aconfig_test_java",
|
||||
name: "aconfig_test_java_library",
|
||||
aconfig_declarations: "aconfig.test.flags",
|
||||
}
|
||||
|
||||
@@ -104,9 +106,30 @@ android_test {
|
||||
manifest: "tests/AndroidManifest.xml",
|
||||
certificate: "platform",
|
||||
static_libs: [
|
||||
"aconfig_test_java_library",
|
||||
"androidx.test.rules",
|
||||
"testng",
|
||||
"aconfig_test_java",
|
||||
],
|
||||
test_suites: ["device-tests"],
|
||||
}
|
||||
|
||||
// integration tests: C++
|
||||
|
||||
cc_aconfig_library {
|
||||
name: "aconfig_test_cpp_library",
|
||||
aconfig_declarations: "aconfig.test.flags",
|
||||
}
|
||||
|
||||
cc_test {
|
||||
name: "aconfig.test.cpp",
|
||||
srcs: [
|
||||
"tests/aconfig_test.cpp",
|
||||
],
|
||||
static_libs: [
|
||||
"aconfig_test_cpp_library",
|
||||
"libgmock",
|
||||
],
|
||||
shared_libs: [
|
||||
"server_configurable_flags",
|
||||
],
|
||||
}
|
||||
|
Reference in New Issue
Block a user