diff --git a/kernel_lite/mem_posix/src/MmapApiTest.cpp b/kernel_lite/mem_posix/src/MmapApiTest.cpp index c7adadc688aa9383c6b50b724dc44542e565a3a1..d48ba7f6e196d9a227c433d6ffa6fff062e4855c 100755 --- a/kernel_lite/mem_posix/src/MmapApiTest.cpp +++ b/kernel_lite/mem_posix/src/MmapApiTest.cpp @@ -348,7 +348,8 @@ HWTEST_F(MmapApiTest, testMmapFilePrivate, Function | MediumTest | Level3) EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -393,7 +394,8 @@ HWTEST_F(MmapApiTest, testMmapFileShare, Function | MediumTest | Level3) EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -433,7 +435,8 @@ HWTEST_F(MmapApiTest, testMmapFileShareOnlyRead, Function | MediumTest | Level1) EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -475,7 +478,8 @@ HWTEST_F(MmapApiTest, testMmapFileShareOnlyWrite, Function | MediumTest | Level3 EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -521,7 +525,8 @@ HWTEST_F(MmapApiTest, testMmapFilePrivateExec, Function | MediumTest | Level4) EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -567,7 +572,8 @@ HWTEST_F(MmapApiTest, testMmapFileShareExec, Function | MediumTest | Level4) EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -610,7 +616,8 @@ HWTEST_F(MmapApiTest, testMmapFileShareNoExec, Function | MediumTest | Level2) EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -743,7 +750,8 @@ HWTEST_F(MmapApiTest, testMmapWriteBack, Function | MediumTest | Level3) EXPECT_TRUE(failure == 0) << "i = " << i << ", rBuffer = " << rBuffer[i]; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } /** @@ -783,8 +791,8 @@ HWTEST_F(MmapApiTest, testMmapEACCES, Function | MediumTest | Level3) EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; } EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } /** @@ -888,7 +896,8 @@ HWTEST_F(MmapApiTest, testMmapEINVAL, Function | MediumTest | Level3) } EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } /** diff --git a/kernel_lite/mem_posix/src/MprotectApiTest.cpp b/kernel_lite/mem_posix/src/MprotectApiTest.cpp index dbdec095d08a654b82d30b9fc8cfbace50d60bcb..9d84de55174956f26b13eca6667b9d5cbaeb333c 100755 --- a/kernel_lite/mem_posix/src/MprotectApiTest.cpp +++ b/kernel_lite/mem_posix/src/MprotectApiTest.cpp @@ -252,7 +252,8 @@ HWTEST_F(MprotectApiTest, testMprotectFileAddReadPerm, Function | MediumTest | L WaitProcExitedOK(pid); EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -308,7 +309,8 @@ HWTEST_F(MprotectApiTest, testMprotectFileAddWritePerm, Function | MediumTest | EXPECT_TRUE(buf[0] == testChar) << "ERROR: buf[0] != testChar"; EXPECT_TRUE(buf[1] == (testChar + 3)) << "ERROR: buf[1] != (testChar + 3)"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -350,7 +352,8 @@ HWTEST_F(MprotectApiTest, testMprotectFileAddExecutePerm, Function | MediumTest WaitProcExitedOK(pid); EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -394,7 +397,8 @@ HWTEST_F(MprotectApiTest, testMprotectFileDelWritePerm, Function | MediumTest | EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -437,7 +441,8 @@ HWTEST_F(MprotectApiTest, testMprotectFileDelExecutePerm, Function | MediumTest EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } } @@ -465,8 +470,8 @@ HWTEST_F(MprotectApiTest, testMprotectEACCES, Function | MediumTest | Level4) EXPECT_TRUE(munmap(mem, len) == 0) << "ERROR: munmap() != 0"; EXPECT_TRUE(close(fd) != -1) << "ERROR: close() == -1"; - - EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0"; + Msleep(1000); + EXPECT_TRUE(remove(file) == 0) << "ERROR: remove() != 0" << errno; } /** diff --git a/kernel_lite/mem_posix/src/MremapApiTest.cpp b/kernel_lite/mem_posix/src/MremapApiTest.cpp index 872e6546b385e37427c7347b5635926a1f196e74..8f069f7b6e2406111026e183f5e2b61d43bf2d81 100755 --- a/kernel_lite/mem_posix/src/MremapApiTest.cpp +++ b/kernel_lite/mem_posix/src/MremapApiTest.cpp @@ -97,7 +97,7 @@ HWTEST_F(MremapApiTest, testMremapAnonExpand, Function | MediumTest | Level2) exit(0); } else { WaitProcExitedOK(pid); - EXPECT_TRUE(munmap(mem, expandSize) == 0) << "ERROR: munmap() != 0"; + EXPECT_TRUE(munmap(mem, expandSize) == 0) << "ERROR: munmap() != 0" << errno; } } @@ -135,7 +135,7 @@ HWTEST_F(MremapApiTest, testMremapAnonShrink, Function | MediumTest | Level3) exit(0); } else { ExpectProcCrashed(pid); - EXPECT_TRUE(munmap(mem, shrinkSize) == 0) << "ERROR: munmap() != 0"; + EXPECT_TRUE(munmap(mem, shrinkSize) == 0) << "ERROR: munmap() != 0" << errno; } } @@ -179,7 +179,7 @@ HWTEST_F(MremapApiTest, testMremapAnonExpandFixAddr, Function | MediumTest | Lev exit(0); } else { WaitProcExitedOK(pid); - EXPECT_TRUE(munmap(mem, expandSize) == 0) << "ERROR: munmap() != 0"; + EXPECT_TRUE(munmap(mem, expandSize) == 0) << "ERROR: munmap() != 0" << errno; } } @@ -219,7 +219,7 @@ HWTEST_F(MremapApiTest, testMremapAnonShrinkFixAddr, Function | MediumTest | Lev exit(0); } else { ExpectProcCrashed(pid); - EXPECT_TRUE(munmap(mem, shrinkSize) == 0) << "ERROR: munmap() != 0"; + EXPECT_TRUE(munmap(mem, shrinkSize) == 0) << "ERROR: munmap() != 0" <