From e98eb8fd48a0e4ab69ea8f4084f4ee64d6863d03 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Mon, 3 Apr 2023 02:59:12 -0400 Subject: [PATCH] test: simplify TESTs files - simple file names - unconditional test file removal in TEST8 Signed-off-by: Tomasz Gromadzki --- src/test/RUNTESTS | 2 +- src/test/obj_pmalloc_mt/TEST0 | 2 +- src/test/obj_pmalloc_mt/TEST1 | 2 +- src/test/obj_pmalloc_mt/TEST2 | 2 +- src/test/obj_pmalloc_mt/TEST3 | 2 +- src/test/obj_pmalloc_mt/TEST8 | 15 ++++++--------- src/test/obj_pmalloc_mt/err8.log.match | 2 +- 7 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/test/RUNTESTS b/src/test/RUNTESTS index bf852132726..29a2c23ec0b 100755 --- a/src/test/RUNTESTS +++ b/src/test/RUNTESTS @@ -354,7 +354,7 @@ testtype=check fstype=all testconfig="./testconfig.sh" killopt="-k 10s" -runtest_timeout="30m" +runtest_timeout="3m" use_timeout="ok" testfile=all testseq=all diff --git a/src/test/obj_pmalloc_mt/TEST0 b/src/test/obj_pmalloc_mt/TEST0 index 1edc574bc3f..fd065e9193c 100755 --- a/src/test/obj_pmalloc_mt/TEST0 +++ b/src/test/obj_pmalloc_mt/TEST0 @@ -16,6 +16,6 @@ configure_valgrind helgrind force-enable setup PMEM_IS_PMEM_FORCE=1 expect_normal_exit\ - ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile.TEST0 + ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile0 pass diff --git a/src/test/obj_pmalloc_mt/TEST1 b/src/test/obj_pmalloc_mt/TEST1 index c339fcb290e..9c55955adb9 100755 --- a/src/test/obj_pmalloc_mt/TEST1 +++ b/src/test/obj_pmalloc_mt/TEST1 @@ -16,6 +16,6 @@ configure_valgrind helgrind force-disable setup PMEM_IS_PMEM_FORCE=1 expect_normal_exit\ - ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile.TEST1 + ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile1 pass diff --git a/src/test/obj_pmalloc_mt/TEST2 b/src/test/obj_pmalloc_mt/TEST2 index 62863748461..2abd46e192a 100755 --- a/src/test/obj_pmalloc_mt/TEST2 +++ b/src/test/obj_pmalloc_mt/TEST2 @@ -16,6 +16,6 @@ configure_valgrind helgrind force-enable setup PMEM_IS_PMEM_FORCE=1 expect_normal_exit\ - ./obj_pmalloc_mt$EXESUFFIX 4 64 4 $DIR/testfile.TEST2 + ./obj_pmalloc_mt$EXESUFFIX 4 64 4 $DIR/testfile2 pass diff --git a/src/test/obj_pmalloc_mt/TEST3 b/src/test/obj_pmalloc_mt/TEST3 index 3e2676625d5..7f230ae0e14 100755 --- a/src/test/obj_pmalloc_mt/TEST3 +++ b/src/test/obj_pmalloc_mt/TEST3 @@ -16,6 +16,6 @@ configure_valgrind drd force-enable setup PMEM_IS_PMEM_FORCE=1 expect_normal_exit\ - ./obj_pmalloc_mt$EXESUFFIX 4 64 4 $DIR/testfile.TEST3 + ./obj_pmalloc_mt$EXESUFFIX 4 64 4 $DIR/testfile3 pass diff --git a/src/test/obj_pmalloc_mt/TEST8 b/src/test/obj_pmalloc_mt/TEST8 index 6f94e8edad1..cb49ad906cc 100755 --- a/src/test/obj_pmalloc_mt/TEST8 +++ b/src/test/obj_pmalloc_mt/TEST8 @@ -11,23 +11,20 @@ require_valgrind 3.10 require_fs_type pmem -require_test_type medium +require_test_type long configure_valgrind helgrind force-enable setup -if test -f "rm $DIR/testfile.TEST8"; then - rm $DIR/testfile.TEST8 -fi +rm -f $DIR/testfile8 + PMEM_IS_PMEM_FORCE=1 expect_normal_exit\ - ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile.TEST8 + ./obj_pmalloc_mt$EXESUFFIX 32 100 10 $DIR/testfile8 -if test -f "rm $DIR/testfile.TEST8"; then - rm $DIR/testfile.TEST8 -fi +rm $DIR/testfile8 PMEM_IS_PMEM_FORCE=1 expect_abnormal_exit\ - ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile.TEST8 + ./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile8 check diff --git a/src/test/obj_pmalloc_mt/err8.log.match b/src/test/obj_pmalloc_mt/err8.log.match index a394bfaf571..bce206a6dc6 100644 --- a/src/test/obj_pmalloc_mt/err8.log.match +++ b/src/test/obj_pmalloc_mt/err8.log.match @@ -1 +1 @@ -{obj_pmalloc_mt.c:52 alloc_worker} obj_pmalloc_mt/TEST8: Error: assertion failure: a->r->offs[a->idx][i] (0x0) != 0 (0x0) +{obj_pmalloc_mt.c:66 realloc_worker} obj_pmalloc_mt/TEST8: Error: assertion failure: ret (0xffffffffffffffff) == 0 (0x0) \ No newline at end of file