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

1 files changed, 20 insertions, 20 deletions

diff --git a/libnativebridge/tests/CodeCacheStatFail_test.cpp b/libnativebridge/tests/CodeCacheStatFail_test.cpp
index 4ea519ee96..768f07944c 100644
--- a/libnativebridge/tests/CodeCacheStatFail_test.cpp
+++ b/libnativebridge/tests/CodeCacheStatFail_test.cpp
@@ -26,26 +26,26 @@ namespace android {
 // Tests that the bridge is initialized without errors if the code_cache is
 // existed as a file.
 TEST_F(NativeBridgeTest, CodeCacheStatFail) {
-    int fd = creat(kCodeCache, O_RDWR);
-    ASSERT_NE(-1, fd);
-    close(fd);
-
-    struct stat st;
-    ASSERT_EQ(-1, stat(kCodeCacheStatFail, &st));
-    ASSERT_EQ(ENOTDIR, errno);
-
-    // Init
-    ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary, nullptr));
-    ASSERT_TRUE(PreInitializeNativeBridge(kCodeCacheStatFail, "isa"));
-    ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
-    ASSERT_TRUE(NativeBridgeAvailable());
-    ASSERT_FALSE(NativeBridgeError());
-
-    // Clean up
-    UnloadNativeBridge();
-
-    ASSERT_FALSE(NativeBridgeError());
-    unlink(kCodeCache);
+  int fd = creat(codeCache(), O_RDWR);
+  ASSERT_NE(-1, fd);
+  close(fd);
+
+  struct stat st;
+  ASSERT_EQ(-1, stat(codeCacheStatFail(), &st));
+  ASSERT_EQ(ENOTDIR, errno);
+
+  // Init
+  ASSERT_TRUE(LoadNativeBridge(kNativeBridgeLibrary, nullptr));
+  ASSERT_TRUE(PreInitializeNativeBridge(codeCacheStatFail(), "isa"));
+  ASSERT_TRUE(InitializeNativeBridge(nullptr, nullptr));
+  ASSERT_TRUE(NativeBridgeAvailable());
+  ASSERT_FALSE(NativeBridgeError());
+
+  // Clean up
+  UnloadNativeBridge();
+
+  ASSERT_FALSE(NativeBridgeError());
+  unlink(codeCache());
 }
 
 }  // namespace android