From 3f3ac2c75b1cef76ef2af73371880cce8ec43455 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 7 May 2024 16:55:00 -0700 Subject: Use isolated: true instead of test_per_src: true in libnativebridge_tests libnativebridge_tests uses test_per_src: true to avoid running multiple tests in the same process. gtest_isolated uses separate processes for each test, but without the various incompatibilities caused by test_per_src. Switch to isolated: true instead. Create a temporary directory in the constructor of the shared NativeBridgeTest base class instead and put the code_cache directory inside it to keep the tests from trying to modify the current directory. Also add the tests to TEST_MAPPING and remove the preupload check. Bug: 189484095 Test: atest --host libnativebridge_tests Test: atest libnativebridge_tests Flag: TEST_ONLY Change-Id: Iea522c1895f1f5996b10e545c44d6b00bda1ee3d --- libnativebridge/tests/CodeCacheExists_test.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libnativebridge/tests/CodeCacheExists_test.cpp') diff --git a/libnativebridge/tests/CodeCacheExists_test.cpp b/libnativebridge/tests/CodeCacheExists_test.cpp index 8ba01586b5..c740bec79c 100644 --- a/libnativebridge/tests/CodeCacheExists_test.cpp +++ b/libnativebridge/tests/CodeCacheExists_test.cpp @@ -27,26 +27,26 @@ namespace android { TEST_F(NativeBridgeTest, CodeCacheExists) { // Make sure that code_cache does not exists struct stat st; - ASSERT_EQ(-1, stat(kCodeCache, &st)); + ASSERT_EQ(-1, stat(codeCache(), &st)); ASSERT_EQ(ENOENT, errno); // Create the code_cache - ASSERT_EQ(0, mkdir(kCodeCache, S_IRWXU | S_IRWXG | S_IXOTH)); + ASSERT_EQ(0, mkdir(codeCache(), S_IRWXU | S_IRWXG | S_IXOTH)); // Init ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary, nullptr)); - ASSERT_TRUE(PreInitializeNativeBridge(".", "isa")); + ASSERT_TRUE(PreInitializeNativeBridge(appDataDir(), "isa")); ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr)); ASSERT_TRUE(NativeBridgeAvailable()); ASSERT_FALSE(NativeBridgeError()); // Check that the code cache is still there - ASSERT_EQ(0, stat(kCodeCache, &st)); + ASSERT_EQ(0, stat(codeCache(), &st)); ASSERT_TRUE(S_ISDIR(st.st_mode)); // Clean up UnloadNativeBridge(); - ASSERT_EQ(0, rmdir(kCodeCache)); + ASSERT_EQ(0, rmdir(codeCache())); ASSERT_FALSE(NativeBridgeError()); } -- cgit v1.2.3-59-g8ed1b