diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/dd/reblock.sh | 4 | ||||
| -rwxr-xr-x | tests/dd/stats.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/dd/reblock.sh b/tests/dd/reblock.sh index cd9d94205..d950b39f4 100755 --- a/tests/dd/reblock.sh +++ b/tests/dd/reblock.sh @@ -23,14 +23,14 @@ print_ver_ dd cat <<\EOF > exp-reblock || framework_failure_ 0+2 records in 1+1 records out -4 bytes (4 B) copied +4 bytes copied EOF # 2 short reads -> 2 partial writes cat <<\EOF > exp-no-reblock || framework_failure_ 0+2 records in 0+2 records out -4 bytes (4 B) copied +4 bytes copied EOF diff --git a/tests/dd/stats.sh b/tests/dd/stats.sh index da2c2d25f..f2cbef94b 100755 --- a/tests/dd/stats.sh +++ b/tests/dd/stats.sh @@ -60,14 +60,14 @@ for open in '' '1'; do wait # Ensure all data processed and at least last status written - grep '250000000 bytes .* copied' err || { cat err; fail=1; } + grep '250000000 bytes (250 MB, 238 MiB) copied' err || { cat err; fail=1; } done progress_output() { { sleep "$1"; echo 1; } | dd bs=1 status=progress of=/dev/null 2>err - # Progress output should be for "byte ... copied", while final is "bytes ..." - grep 'byte .* copied' err + # Progress output should be for "byte copied", while final is "bytes ..." + grep 'byte copied' err } retry_delay_ progress_output 1 4 || { cat err; fail=1; } |