diff options
Diffstat (limited to 'libnativebridge/tests')
| -rw-r--r-- | libnativebridge/tests/Android.bp | 14 | ||||
| -rw-r--r-- | libnativebridge/tests/PreInitializeNativeBridge_test.cpp | 4 |
2 files changed, 2 insertions, 16 deletions
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp index 4d86d9e708..f1725fc278 100644 --- a/libnativebridge/tests/Android.bp +++ b/libnativebridge/tests/Android.bp @@ -183,20 +183,6 @@ cc_test { ], header_libs: ["libbase_headers"], - // Support multilib variants (using different suffix per sub-architecture), - // which is needed on build targets with secondary architectures, as the CTS - // test suite packaging logic flattens all test artifacts into a single - // `testcases` directory. - compile_multilib: "both", - multilib: { - lib32: { - suffix: "32", - }, - lib64: { - suffix: "64", - }, - }, - test_config_template: ":art-gtests-target-standalone-cts-template", test_suites: [ "cts", diff --git a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp index 149b05ed7c..98ef30f11b 100644 --- a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp +++ b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp @@ -39,7 +39,7 @@ TEST_F(NativeBridgeTest, PreInitializeNativeBridge) { // Try to create our mount namespace. if (unshare(CLONE_NEWNS) != -1) { // Create a placeholder file. - FILE* cpuinfo = fopen("./cpuinfo", "w"); + FILE* cpuinfo = fopen("./cpuinfo", "we"); ASSERT_NE(nullptr, cpuinfo) << strerror(errno); fprintf(cpuinfo, kTestData); fclose(cpuinfo); @@ -47,7 +47,7 @@ TEST_F(NativeBridgeTest, PreInitializeNativeBridge) { ASSERT_TRUE(PreInitializeNativeBridge("does not matter 1", "short 2")); // Read /proc/cpuinfo - FILE* proc_cpuinfo = fopen("/proc/cpuinfo", "r"); + FILE* proc_cpuinfo = fopen("/proc/cpuinfo", "re"); ASSERT_NE(nullptr, proc_cpuinfo) << strerror(errno); char buf[1024]; EXPECT_NE(nullptr, fgets(buf, sizeof(buf), proc_cpuinfo)) << "Error reading."; |