From: James Nunez <james.a.nunez@intel.com>
Date: Wed, 6 Dec 2017 00:17:16 +0000 (-0700)
Subject: LU-10316 tests: skip checksum check for sanity 77c
X-Git-Tag: 2.10.4-RC1~86
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F30653%2F4;p=fs%2Flustre-release.git

LU-10316 tests: skip checksum check for sanity 77c

sanity test 77c does not need to verify the checksum for
some versions of Lustre servers. The code to skip the
checksum verification is in place, but it is missing a
'retun 0;' to exit the test.

This is a port from master to b2_10 of
Lustre change: https://review.whamcloud.com/#/c/30402/
Lustre commit: 1332698e39723ce5684f062ed969efdcf2d01536

Test-Parameters: trivial

Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: I9ea19f699d1142475f84d59b9c31880b7daf7f52
Reviewed-on: https://review.whamcloud.com/30653
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Reviewed-by: Saurabh Tandan <saurabh.tandan@intel.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index fe9d507..725463c 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -6197,7 +6197,7 @@ test_77c() {
 	[[ "$orig_cksum" == "$dump_cksum" ]] ||
 		error "dump content does not match on Client"
 
-	$check_ost || skip "No need to check cksum dump on OSS"
+	$check_ost || { skip "No need to check cksum dump on OSS"; return 0; }
 
 	# check cksum dump on OSS
 	ost_file=$(do_facet ost1 ls ${ost_file_prefix}\*)