With log_out() function now changed to print the message after the pthread join operation, it is safe to also add "Scan group range" related messages in expect files to compare against the pfsck output. Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@xxxxxxxxx> --- tests/f_multithread_ok/expect.1 | 8 ++++++++ tests/f_multithread_ok/script | 17 ----------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/tests/f_multithread_ok/expect.1 b/tests/f_multithread_ok/expect.1 index 4742f408..cecc11db 100644 --- a/tests/f_multithread_ok/expect.1 +++ b/tests/f_multithread_ok/expect.1 @@ -1,4 +1,12 @@ Pass 1: Checking inodes, blocks, and sizes +[Thread 0] Scan group range [0, 1) +[Thread 1] Scan group range [1, 2) +[Thread 2] Scan group range [2, 3) +[Thread 3] Scan group range [3, 4) +[Thread 0] Scanned group range [0, 1), inodes 8192 +[Thread 1] Scanned group range [1, 2), inodes 8192 +[Thread 2] Scanned group range [2, 3), inodes 8192 +[Thread 3] Scanned group range [3, 4), inodes 8192 Pass 2: Checking directory structure Pass 3: Checking directory connectivity Pass 4: Checking reference counts diff --git a/tests/f_multithread_ok/script b/tests/f_multithread_ok/script index 7334cde6..f14034cf 100644 --- a/tests/f_multithread_ok/script +++ b/tests/f_multithread_ok/script @@ -1,21 +1,4 @@ FSCK_OPT="-fym4" -SKIP_VERIFY="true" ONE_PASS_ONLY="true" -SKIP_CLEANUP="true" . $cmd_dir/run_e2fsck - -grep -v Thread $OUT1 > $OUT1.tmp -cmp -s $EXP1 $OUT1.tmp -status1=$? -if [ "$status1" -eq 0 ]; then - echo "$test_name: $test_description: ok" - touch $test_name.ok -else - echo "$test_name: $test_description: failed" - diff $DIFF_OPTS $EXP1 $OUT1.tmp > $test_name.failed -fi - -unset IMAGE FSCK_OPT SECOND_FSCK_OPT OUT1 OUT2 EXP1 EXP2 -unset SKIP_VERIFY SKIP_CLEANUP SKIP_GUNZIP ONE_PASS_ONLY PREP_CMD -unset DESCRIPTION SKIP_UNLINK AFTER_CMD PASS_ZERO -- 2.37.3
