diff options
Diffstat (limited to 'tests/functions.sh')
| -rw-r--r-- | tests/functions.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index 7d9688691..384368b13 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -470,16 +470,19 @@ s/# <!-- util-linux.*-->//; } function ts_fdisk_clean { - local DEVNAME=$(basename "$1") + local DEVNAME=$1 # remove non comparable parts of fdisk output if [ x"${DEVNAME}" != x"" ]; then - sed -i -e "s/\/dev\/${DEVNAME}/\/dev\/.../g" $TS_OUTPUT + sed -i -e "s:${DEVNAME}:<removed>:g" $TS_OUTPUT fi - sed -i -e 's/Disk identifier:.*//g' \ - -e 's/Building a new.*//g' \ - -e 's/Welcome to fdisk.*//g' \ + sed -i -e 's/Disk identifier:.*/Disk identifier: <removed>/g' \ + -e 's/Created a new.*/Created a new <removed>./g' \ + -e 's/^Device[[:blank:]]*Start/Device Start/g' \ + -e 's/^Device[[:blank:]]*Boot/Device Boot/g' \ + -e 's/^Device[[:blank:]]*Flag/Device Flag/g' \ + -e 's/Welcome to fdisk.*/Welcome to fdisk <removed>./g' \ $TS_OUTPUT } |