diff options
author | Martin Stjernholm <mast@google.com> | 2021-05-27 20:54:22 +0100 |
---|---|---|
committer | Martin Stjernholm <mast@google.com> | 2021-06-09 17:02:34 +0100 |
commit | 07f5e96d63121165b82635b6b7fa187ec3920612 (patch) | |
tree | 90ccf13b6bda6eb2e5d80c9a7db79d4e8116ff7e /libnativebridge/tests/NativeBridgeTest.h | |
parent | 55309dbfe91c3bf3e9b8da24c002ad52deb3c5e5 (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/NativeBridgeTest.h')
-rw-r--r-- | libnativebridge/tests/NativeBridgeTest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnativebridge/tests/NativeBridgeTest.h b/libnativebridge/tests/NativeBridgeTest.h index cd0fd015af..62509b8917 100644 --- a/libnativebridge/tests/NativeBridgeTest.h +++ b/libnativebridge/tests/NativeBridgeTest.h @@ -27,6 +27,7 @@ constexpr const char* kCodeCache = "./code_cache"; constexpr const char* kCodeCacheStatFail = "./code_cache/temp"; constexpr const char* kNativeBridgeLibrary2 = "libnativebridge2-test-case.so"; constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case.so"; +constexpr const char* kNativeBridgeLibrary6 = "libnativebridge6-test-case.so"; namespace android { @@ -36,4 +37,3 @@ class NativeBridgeTest : public testing::Test { }; // namespace android #endif // ART_LIBNATIVEBRIDGE_TESTS_NATIVEBRIDGETEST_H_ - |