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/PreInitializeNativeBridgeFail1_test.cpp | |
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/PreInitializeNativeBridgeFail1_test.cpp')
-rw-r--r-- | libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp b/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp deleted file mode 100644 index 5a2b0a150f..0000000000 --- a/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "NativeBridgeTest.h" - -#include <dlfcn.h> -#include <errno.h> -#include <fcntl.h> -#include <stdio.h> -#include <sys/mount.h> -#include <sys/stat.h> - -#include <cstdio> -#include <cstring> - -#include <android/log.h> - -namespace android { - -TEST_F(NativeBridgeTest, PreInitializeNativeBridgeFail1) { - // Needs a valid application directory. - ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary, nullptr)); - ASSERT_FALSE(PreInitializeNativeBridge(nullptr, "isa")); - ASSERT_TRUE(NativeBridgeError()); -} - -} // namespace android |