summaryrefslogtreecommitdiff
path: root/libnativebridge/tests/NativeBridgeTestCase2.cpp
diff options
context:
space:
mode:
authorMartin Stjernholm <mast@google.com>2021-05-27 20:54:22 +0100
committerMartin Stjernholm <mast@google.com>2021-06-09 17:02:34 +0100
commit07f5e96d63121165b82635b6b7fa187ec3920612 (patch)
tree90ccf13b6bda6eb2e5d80c9a7db79d4e8116ff7e /libnativebridge/tests/NativeBridgeTestCase2.cpp
parent55309dbfe91c3bf3e9b8da24c002ad52deb3c5e5 (diff)
Fix bitrot in the libnativebridge tests.
- Bitrot 1: NativeBridge2Signal_test stopped working when version 3 was added in https://r.android.com/234059. - Bitrot 2: The code path that PreInitializeNativeBridgeFail1_test tested was removed completely when missing app data directory was allowed in https://r.android.com/1208629, so delete the test. - Use cc_test_library for the dynamic test libs so they are installed in the test directory rather than in system/lib(64). - Use test_per_src since native_bridge.cc doesn't support reloading the native bridge implementation lib after unloading. - Add a custom script to run the tests and a preupload check that the script is run. (Configuring atest for these tests still TBD in b/189484095 - test_per_src is a complication.) Cherry-picked from https://r.android.com/1721410. Test: art/libnativebridge/tests/runtests.sh Bug: 122710865 Bug: 189484095 Change-Id: Ib2b387e1d858127ca4bb44c548a5105ea8b838d8 Merged-In: Ib2b387e1d858127ca4bb44c548a5105ea8b838d8
Diffstat (limited to 'libnativebridge/tests/NativeBridgeTestCase2.cpp')
-rw-r--r--libnativebridge/tests/NativeBridgeTestCase2.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/libnativebridge/tests/NativeBridgeTestCase2.cpp b/libnativebridge/tests/NativeBridgeTestCase2.cpp
index 3c75ebfb51..5164dec7be 100644
--- a/libnativebridge/tests/NativeBridgeTestCase2.cpp
+++ b/libnativebridge/tests/NativeBridgeTestCase2.cpp
@@ -46,8 +46,8 @@ extern "C" const struct android::NativeBridgeRuntimeValues* native_bridge2_getAp
}
extern "C" bool native_bridge2_is_compatible_compatible_with(uint32_t version) {
- // For testing, allow 1 and 2, but disallow 3+.
- return version <= 2;
+ // For testing, allow 1-3, but disallow later.
+ return version <= 3;
}
static bool native_bridge2_test_case_signal_handler(int, siginfo_t*, void*) {
@@ -73,4 +73,3 @@ android::NativeBridgeCallbacks NativeBridgeItf {
.isCompatibleWith = &native_bridge2_is_compatible_compatible_with,
.getSignalHandler = &native_bridge2_get_signal_handler
};
-