From 94e040042a05bc90f585c5d7f87181e4f2241548 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 15 Feb 2016 14:31:25 -0500 Subject: [PATCH] [PATCH] fix guilt tests for new dd output Newer dd sez: 1024 bytes (1.0 kB, 1.0 KiB) copied, 0.00147511 s, 694 kB/s Filter out the kiB as well. Signed-off-by: Eric Sandeen Signed-off-by: Josef 'Jeff' Sipek --- regression/scaffold | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/regression/scaffold b/regression/scaffold index 6605034..4099b11 100644 --- a/regression/scaffold +++ b/regression/scaffold @@ -42,9 +42,11 @@ function replace_path -e "\\,^Deleted branch guilt/.* (was .*).$,d" } +# Newer dd does +# (1.0 kB, 1.0 kiB) copied, ... function filter_dd { - sed -e 's:^\([0-9]*\) bytes (\([0-9]*\.[0-9]* .B\)) copied.*$:\1 bytes (\2) copied:' + sed -e 's:^\([0-9]*\) bytes (\([0-9]*\.[0-9]* .B\).*) copied.*$:\1 bytes (\2) copied:' } # usage: cmd .. -- 2.11.4.GIT