[LTP] [PATCH] Clean up hugemmap02 testcase
shuang.qiu@oracle.com
shuang.qiu@oracle.com
Fri Jan 8 09:20:54 CET 2016
From: Shuang Qiu <shuang.qiu@oracle.com>
It misses the cleanup when continue in the loop.
And it also needs to munmap() addr2 for 32-bit.
Signed-off-by: Shuang Qiu <shuang.qiu@oracle.com>
---
testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
index 1a44993..8c2a9b2 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
@@ -155,24 +155,20 @@ int main(int ac, char **av)
addr2 = mmap((void *)low_addr2, map_sz, PROT_READ | PROT_WRITE,
MAP_SHARED, fildes, 0);
#if __WORDSIZE == 64 /* 64-bit process */
- if (addr2 == MAP_FAILED) {
+ if (addr2 == MAP_FAILED)
tst_resm(TFAIL | TERRNO, "huge mmap failed unexpectedly"
" with %s (64-bit)", TEMPFILE);
- close(fildes);
- continue;
- } else {
+ else {
tst_resm(TPASS, "huge mmap succeeded (64-bit)");
}
#else /* 32-bit process */
if (addr2 == MAP_FAILED)
tst_resm(TFAIL | TERRNO, "huge mmap failed unexpectedly"
" with %s (32-bit)", TEMPFILE);
- else if (addr2 > 0) {
+ else if (addr2 > 0)
tst_resm(TCONF,
"huge mmap failed to test the scenario");
- close(fildes);
- continue;
- } else if (addr == 0)
+ else if (addr == 0)
tst_resm(TPASS, "huge mmap succeeded (32-bit)");
#endif
@@ -183,10 +179,8 @@ int main(int ac, char **av)
"munmap of addrlist[%d] failed", i);
}
-#if __WORDSIZE == 64
if (munmap(addr2, map_sz) == -1)
tst_brkm(TFAIL | TERRNO, NULL, "huge munmap failed");
-#endif
if (munmap(addr, page_sz) == -1)
tst_brkm(TFAIL | TERRNO, NULL, "munmap failed");
--
1.7.9.5
More information about the Ltp
mailing list