tests: blkdiscard, check return values

CC: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/tests/expected/blkdiscard/offsets b/tests/expected/blkdiscard/offsets
index 2596fc602b2f1af692c4f6773e14fc2fcd991df8..aa90f2f9ef17be3db4edd178f825077502564889 100644 (file)
--- a/tests/expected/blkdiscard/offsets
+++ b/tests/expected/blkdiscard/offsets
@@ -1,39 +1,70 @@
 create loop device from image
 testing offsets with full block size
 Discarded 10485760 bytes from the offset 0
+ret: 0
 blkdiscard: offset 1 is not aligned to sector size 512
+ret: 1
 blkdiscard: offset 511 is not aligned to sector size 512
+ret: 1
 Discarded 10485248 bytes from the offset 512
+ret: 0
 Discarded 10484736 bytes from the offset 1024
+ret: 0
 testing offsets with specific length
 Discarded 5242880 bytes from the offset 0
+ret: 0
 blkdiscard: length 5242881 is not aligned to sector size 512
+ret: 1
 blkdiscard: length 5243391 is not aligned to sector size 512
+ret: 1
 blkdiscard: offset 1 is not aligned to sector size 512
+ret: 1
 blkdiscard: offset 511 is not aligned to sector size 512
+ret: 1
 Discarded 5242880 bytes from the offset 512
+ret: 0
 Discarded 5242880 bytes from the offset 1024
+ret: 0
 testing aligned steps full device
 Discarded 10485760 bytes from the offset 0
+ret: 0
 Discarded 10485760 bytes from the offset 0
+ret: 0
 testing aligned steps with offsets and length
 Discarded 1024 bytes from the offset 0
+ret: 0
 blkdiscard: offset 1 is not aligned to sector size 512
+ret: 1
 blkdiscard: offset 1 is not aligned to sector size 512
+ret: 1
 blkdiscard: offset 511 is not aligned to sector size 512
+ret: 1
 Discarded 1536 bytes from the offset 512
+ret: 0
 Discarded 1024 bytes from the offset 1024
+ret: 0
 testing misaligned steps full device
 blkdiscard: length 1 is not aligned to sector size 512
+ret: 1
 blkdiscard: length 256 is not aligned to sector size 512
+ret: 1
 blkdiscard: length 511 is not aligned to sector size 512
+ret: 1
 blkdiscard: length 513 is not aligned to sector size 512
+ret: 1
 blkdiscard: length 768 is not aligned to sector size 512
+ret: 1
 testing misaligned steps with offsets and length
 blkdiscard: length 511 is not aligned to sector size 512
+ret: 1
 blkdiscard: offset 1 is not aligned to sector size 512
+ret: 1
 blkdiscard: offset 511 is not aligned to sector size 512
+ret: 1
 blkdiscard: length 511 is not aligned to sector size 512
+ret: 1
 blkdiscard: offset 1 is not aligned to sector size 512
+ret: 1
 blkdiscard: offset 511 is not aligned to sector size 512
+ret: 1
 detach loop device from image

diff --git a/tests/ts/blkdiscard/offsets b/tests/ts/blkdiscard/offsets
index eb0097ec8f42f058efd1474be41e47a501e83ef8..29597ad1852a1670aabb196f659c27203f3b6f09 100755 (executable)
--- a/tests/ts/blkdiscard/offsets
+++ b/tests/ts/blkdiscard/offsets
@@ -35,50 +35,59 @@ truncate -s 10M $IMAGE_PATH
 ts_log "create loop device from image"
 DEVICE=$($TS_CMD_LOSETUP --show -f $IMAGE_PATH)
 ts_register_loop_device "$DEVICE"
-CMD_SED_DEVICE="sed s#$DEVICE:\s##"
+
+function run_tscmd {
+       local ret
+       "$@" >> $TS_OUTPUT 2>&1
+       ret=$?
+       echo "ret: $ret" >> "$TS_OUTPUT"
+       return $ret
+}
 
 ts_log "testing offsets with full block size"
-$TS_CMD_BLKDISCARD -v $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -o 1 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -o 511 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -o 512 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -o 1024 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
+run_tscmd $TS_CMD_BLKDISCARD -v $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -o 1 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -o 511 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -o 512 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -o 1024 $DEVICE
 
 ts_log "testing offsets with specific length"
-$TS_CMD_BLKDISCARD -v -l 5242880 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -l 5242881 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -l 5243391 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -o 1 -l 5242880 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -o 511 -l 5242880 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -o 512 -l 5242880 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -o 1024 -l 5242880 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
+run_tscmd $TS_CMD_BLKDISCARD -v -l 5242880 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -l 5242881 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -l 5243391 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -o 1 -l 5242880 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -o 511 -l 5242880 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -o 512 -l 5242880 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -o 1024 -l 5242880 $DEVICE
 
 ts_log "testing aligned steps full device"
-$TS_CMD_BLKDISCARD -v -p 5242880 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 1310720 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
+run_tscmd $TS_CMD_BLKDISCARD -v -p 5242880 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 1310720 $DEVICE
 
 ts_log "testing aligned steps with offsets and length"
-$TS_CMD_BLKDISCARD -v -p 512 -l 1024 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 512 -o 1 -l 1024 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 512 -o 1 -l 1536 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 512 -o 511 -l 1536 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 512 -o 512 -l 1536 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 512 -o 1024 -l 1024 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
+run_tscmd $TS_CMD_BLKDISCARD -v -p 512 -l 1024 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 512 -o 1 -l 1024 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 512 -o 1 -l 1536 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 512 -o 511 -l 1536 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 512 -o 512 -l 1536 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 512 -o 1024 -l 1024 $DEVICE
 
 ts_log "testing misaligned steps full device"
-$TS_CMD_BLKDISCARD -v -p 1 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 256 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 511 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 513 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 768 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
+run_tscmd $TS_CMD_BLKDISCARD -v -p 1 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 256 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 511 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 513 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 768 $DEVICE
 
 ts_log "testing misaligned steps with offsets and length"
-$TS_CMD_BLKDISCARD -v -p 511 -l 1024 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 511 -o 1 -l 1536 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 511 -o 511 -l 1536 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 511 -l 10240 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 511 -o 1 -l 10240 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
-$TS_CMD_BLKDISCARD -v -p 511 -o 511 -l 10240 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT
+run_tscmd $TS_CMD_BLKDISCARD -v -p 511 -l 1024 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 511 -o 1 -l 1536 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 511 -o 511 -l 1536 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 511 -l 10240 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 511 -o 1 -l 10240 $DEVICE
+run_tscmd $TS_CMD_BLKDISCARD -v -p 511 -o 511 -l 10240 $DEVICE
+
+sed -i "s#$DEVICE:\s##" $TS_OUTPUT
 
 ts_log "detach loop device from image"