| Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
| 3 | |
| 4 | From 45fe65d934df2c938701f1c3cd3e0a6f3bdf25e6 Mon Sep 17 00:00:00 2001 |
| 5 | From: Ross Burton <ross.burton@arm.com> |
| 6 | Date: Tue, 29 Jun 2021 18:10:40 +0100 |
| 7 | Subject: [PATCH] tests/blkdiscard: check correct log file for errors |
| 8 | |
| 9 | When checking if the discard ioctl is supported, look in stderr not stdout. |
| 10 | |
| 11 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
| 12 | --- |
| 13 | tests/ts/blkdiscard/offsets | 2 +- |
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/tests/ts/blkdiscard/offsets b/tests/ts/blkdiscard/offsets |
| 17 | index 9dddc35e2..5e724d51b 100755 |
| 18 | --- a/tests/ts/blkdiscard/offsets |
| 19 | +++ b/tests/ts/blkdiscard/offsets |
| 20 | @@ -48,7 +48,7 @@ ts_log "testing offsets with full block size" |
| 21 | run_tscmd $TS_CMD_BLKDISCARD -v $DEVICE |
| 22 | if [ "$?" != "0" ]; then |
| 23 | # Skip the rest? For example loop backing files on NFS seem unsupported. |
| 24 | - grep -q "BLKDISCARD ioctl failed: Operation not supported" "$TS_OUTPUT" \ |
| 25 | + grep -q "BLKDISCARD ioctl failed: Operation not supported" "$TS_ERRLOG" \ |
| 26 | && ts_skip "BLKDISCARD not supported" |
| 27 | fi |
| 28 | run_tscmd $TS_CMD_BLKDISCARD -v -o 1 $DEVICE |
| 29 | -- |
| 30 | 2.25.1 |
| 31 | |