Skip to content

Commit

Permalink
btrfs-progs: tests: fix the mount failure detection
Browse files Browse the repository at this point in the history
[BUG]
After commit "btrfs-progs: tests: dump dmesg if a mount fails", test
case misc/041 would output the following error:

    [TEST/misc]   041-subvolume-delete-during-send
 cat: invalid option -- 'f'
 Try 'cat --help' for more information.
 failed: /home/adam/btrfs-progs/btrfs send -f stream19752.out /home/adam/btrfs-progs/tests/mnt/snap1

[CAUSE]
The send command would fail anyway, but the error message is from the
mount detection, which goes like this:

		if cat "${cmd_array[@]}" | grep -q mount; then

Obviously cat is not the correct animal to print cmd_array to
stdout.

[FIX]
I should go "echo" no matter how I enjoy petting a cat.

It's better to fold this into commit "btrfs-progs: tests: dump dmesg if a
mount fails".

Signed-off-by: Qu Wenruo <[email protected]>
  • Loading branch information
adam900710 committed Jun 20, 2024
1 parent 42b1891 commit bde1d48
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/common
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ run_check()

"${cmd_array[@]}" >> "$RESULTS" 2>&1
if [ "$?" -ne 0 ]; then
if cat "${cmd_array[@]}" | grep -q mount; then
if echo "${cmd_array[@]}" | grep -q mount; then
dmesg | tail -n 15 >> "$RESULTS"
fi
_fail "failed: ${cmd_array[@]}"
Expand Down

0 comments on commit bde1d48

Please sign in to comment.