Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: explicitly strip whitespace for broken wc(1) implementations #13032

Merged
merged 1 commit into from
Jan 29, 2022
Merged

tests: explicitly strip whitespace for broken wc(1) implementations #13032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/zfs-tests/tests/functional/alloc_class/alloc_class_012_pos.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ function file_in_special_vdev # <dataset> <inode>
typeset dataset="$1"
typeset inum="$2"
typeset num_normal=$(echo $ZPOOL_DISKS | wc -w)
num_normal=${num_normal##* }

zdb -dddddd $dataset $inum | awk -v d=$num_normal '{
# find DVAs from string "offset level dva" only for L0 (data) blocks
Expand Down
1 change: 1 addition & 0 deletions tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events_clear.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ done
# wait a bit to allow the kernel module to process new events
zpool_events_settle
EVENTS_NUM=$(zpool events -H | wc -l)
EVENTS_NUM=${EVENTS_NUM##* }

# 3. Verify 'zpool events -c' successfully clear new events
CLEAR_OUTPUT=$(zpool events -c)
Expand Down
2 changes: 1 addition & 1 deletion tests/zfs-tests/tests/functional/mv_files/mv_files_common.kshlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function mv_files
function count_files
{
typeset -i file_num
file_num=$(find $1 -type f -print | wc -l)
file_num=$(find $1 -type f -print | wc -l | tr -d ' ')
(( file_num != $2 )) && \
log_fail "The file number of target directory"\
"$2 is not equal to that of the source "\
Expand Down