Skip to content

Commit b8ed133

Browse files
committed
test: add error match files
Narrow test iteration to get proper error log file. Revers logic of test to unblock other tests. Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
1 parent 81f93f9 commit b8ed133

File tree

5 files changed

+39
-24
lines changed

5 files changed

+39
-24
lines changed

src/test/obj_pmalloc_mt/TEST8

+18-12
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,25 @@
99

1010
. ../unittest/unittest.sh
1111

12-
require_valgrind 3.10
13-
require_fs_type pmem non-pmem
14-
require_test_type long
15-
configure_valgrind helgrind force-enable
12+
#require_valgrind 3.10
13+
require_fs_type pmem
14+
require_test_type short
15+
#configure_valgrind helgrind force-enable
1616
setup
1717

18-
for n in {1..500}
19-
do
20-
if test -f "rm $DIR/testfile"; then
21-
rm $DIR/testfile
22-
fi
23-
PMEM_IS_PMEM_FORCE=1 expect_normal_exit\
24-
./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile 1 $n
25-
done
18+
if test -f "rm $DIR/testfile"; then
19+
rm $DIR/testfile
20+
fi
21+
PMEM_IS_PMEM_FORCE=1 expect_normal_exit\
22+
./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile 1 0
23+
24+
if test -f "rm $DIR/testfile"; then
25+
rm $DIR/testfile
26+
fi
27+
28+
PMEM_IS_PMEM_FORCE=1 expect_abnormal_exit\
29+
./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile 1 1
30+
31+
check
2632

2733
pass

src/test/obj_pmalloc_mt/TEST9

+17-12
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,24 @@
99

1010
. ../unittest/unittest.sh
1111

12-
require_valgrind 3.10
13-
require_fs_type pmem non-pmem
14-
require_test_type long
15-
configure_valgrind helgrind force-enable
12+
#require_valgrind 3.10
13+
require_fs_type pmem
14+
require_test_type short
15+
#configure_valgrind helgrind force-enable
1616
setup
1717

18-
for n in {1..50}
19-
do
20-
if test -f "rm $DIR/testfile"; then
21-
rm $DIR/testfile
22-
fi
23-
PMEM_IS_PMEM_FORCE=1 expect_normal_exit\
24-
./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile 0 $n
25-
done
18+
if test -f "rm $DIR/testfile"; then
19+
rm $DIR/testfile
20+
fi
21+
PMEM_IS_PMEM_FORCE=1 expect_normal_exit\
22+
./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile 0 0
23+
24+
if test -f "rm $DIR/testfile"; then
25+
rm $DIR/testfile
26+
fi
27+
PMEM_IS_PMEM_FORCE=1 expect_abnormal_exit\
28+
./obj_pmalloc_mt$EXESUFFIX 32 1000 100 $DIR/testfile 0 1
29+
30+
check
2631

2732
pass
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{obj_pmalloc_mt.c:68 realloc_worker} obj_pmalloc_mt/TEST8: Error: assertion failure: ret (0xffffffffffffffff) == 0 (0x0)
+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{obj_pmalloc_mt.c:68 realloc_worker} obj_pmalloc_mt/TEST9: Error: assertion failure: ret (0xffffffffffffffff) == 0 (0x0)
2+
{obj_pmalloc_mt.c:68 realloc_worker} obj_pmalloc_mt/TEST9: Error: assertion failure: ret (0xffffffffffffffff) == 0 (0x0)

src/test/obj_pmalloc_mt/obj_pmalloc_mt.c

+1
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@ main(int argc, char *argv[])
465465
*/
466466
if (Threads == MAX_THREADS) /* don't run for short tests */
467467
run_worker(tx_worker, args);
468+
468469
run_worker(tx3_worker, args);
469470

470471
pmemobj_close(pop);

0 commit comments

Comments
 (0)