test: simplify TESTs files

grom72 · grom72 · commit e98eb8fd48a0 · 2023-04-03T03:17:02.000-04:00
- simple file names
- unconditional test file removal in TEST8

Signed-off-by: Tomasz Gromadzki &lt;tomasz.gromadzki@intel.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -1 +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)`
	`1`	`+{obj_pmalloc_mt.c:66 realloc_worker} obj_pmalloc_mt/TEST8: Error: assertion failure: ret (0xffffffffffffffff) == 0 (0x0)`