From d90291b46b808946ad99a94a2f2992431fbc8c83 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Thu, 27 May 2021 20:54:22 +0100 Subject: 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.) Test: art/libnativebridge/tests/runtests.sh Bug: 122710865 Bug: 189484095 Change-Id: Ib2b387e1d858127ca4bb44c548a5105ea8b838d8 --- .../tests/PreInitializeNativeBridgeFail1_test.cpp | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp (limited to 'libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp') 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 -#include -#include -#include -#include -#include - -#include -#include - -#include - -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 -- cgit v1.2.3-59-g8ed1b