From 97a64c94671c3116eddd54ca2fdda88dfad466f0 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 21 Sep 2018 15:20:17 -0600 Subject: [PATCH] LU-11282 tests: log skip message for sanityn test_19 Log the skip message for sanityn test_19() rather than just echoing it and returning success. The current behaviour makes it difficult to see if this test is being run or not. Test-Parameters: trivial testlist=sanityn Test-Parameters: testlist=sanityn mdtfilesystemtype=zfs ostfilesystemtype=zfs Signed-off-by: Andreas Dilger Change-Id: I05e2a9ef7c9fc5fb1be6533eab8bcb885f54ca6c Reviewed-on: https://review.whamcloud.com/33214 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Elena Gryaznova Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/sanityn.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index 011b5f5..4cd17e5 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -517,13 +517,10 @@ test_19() { # bug3811 [ "x$DOM" = "xyes" ] && node=$(facet_active_host $SINGLEMDS) # check whether obdfilter is cache capable at all - if ! get_osd_param $node '' read_cache_enable >/dev/null; then - echo "not cache-capable obdfilter" - return 0 - fi + get_osd_param $node '' read_cache_enable >/dev/null || + skip "not cache-capable obdfilter" - local MAX=$(get_osd_param $node '' readcache_max_filesize | \ - head -n 1) + local MAX=$(get_osd_param $node '' readcache_max_filesize | head -n 1) set_osd_param $node '' readcache_max_filesize 4096 dd if=/dev/urandom of=$TMP/$tfile bs=512k count=32 local SUM=$(cksum $TMP/$tfile | cut -d" " -f 1,2) -- 1.8.3.1