From d1cb94f66d5ee84c6124985c9c13fb58938b80ad Mon Sep 17 00:00:00 2001
From: Douglas Fuller <dfuller@redhat.com>
Date: Mon, 6 Apr 2015 14:36:18 -0700
Subject: [PATCH] RBD: update expunge set for latest test, parameterize test
 script

Update expunge set for xfstests to known-good set for RHEL7 and Ubuntu 14.04.
Expunged tests without justifying comments are long-running and have not yet
been thoroughly investigated.

Add an environment variable (optionally passed from xfstests_url variable in
test YAML) to override the default xfstests repo.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
---
 qa/run_xfstests_krbd.sh | 81 ++++++++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 30 deletions(-)

diff --git a/qa/run_xfstests_krbd.sh b/qa/run_xfstests_krbd.sh
index 4e724d92d6443..343cf3a4947cc 100644
--- a/qa/run_xfstests_krbd.sh
+++ b/qa/run_xfstests_krbd.sh
@@ -8,9 +8,12 @@ set -x
 [ -n "${TESTDIR}" ] || export TESTDIR="/tmp/cephtest"
 [ -d "${TESTDIR}" ] || mkdir "${TESTDIR}"
 
-URL_BASE="https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa"
 SCRIPT="run_xfstests.sh"
 
+if [ -z "${URL_BASE}" ]; then
+	URL_BASE="https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa"
+fi
+
 cd "${TESTDIR}"
 
 wget -O "${SCRIPT}" "${URL_BASE}/${SCRIPT}"
@@ -23,37 +26,55 @@ cat > "${EXPUNGE}" <<-!
 	# wasn't run - like 'mv', but wasn't specifically excluded
 	# new test - didn't exist in the xfstests version that was
 	#            used by the old version of this script
+	
+	generic/038
+	generic/042	# zeroes out only the last 4k of test file, but expects
+			#  only zeros in the entire file. bug in test?
+	generic/046	# _count_extents in common/rc assumes backticks do not
+			#  remove newlines. This breaks parsing on some
+			#  platforms.
+	generic/050	# blockdev --setro right after mkfs returns EBUSY
+	generic/081	# ubuntu lvm2 doesn't suport --yes argument
+	generic/083	# mkfs.xfs -dxize=104857600,agcount=6 fails
+			#  when sunit=swidth=8192
+	generic/093	# not for Linux
+	generic/097	# not for Linux
+	generic/099	# not for Linux
+	generic/204	# stripe size throws off test's math for when to
+			#  expect ENOSPC
 
-	generic/062 # mv
-	generic/083 # mv
-	generic/127 # mv
-	generic/204 # mv
-	generic/306 # new test
+	shared/272	# not for xfs
+	shared/289	# not for xfs
 
-	xfs/007     # new test
-	xfs/008     # mv, see 2db20d972125
-	xfs/030     # mv
-	xfs/042     # mv
-	xfs/073     # mv
-	xfs/096     # mv
-	xfs/104     # mv
-	xfs/109     # mv
-	xfs/170     # mv
-	xfs/178     # mv
-	xfs/200     # mv
-	xfs/206     # mv
-	xfs/229     # mv
-	xfs/242     # mv
-	xfs/250     # mv
-	xfs/279     # wasn't run
-	xfs/287     # wasn't run
-	xfs/291     # wasn't run
-	xfs/292     # wasn't run
-	xfs/293     # wasn't run
-	xfs/295     # wasn't run
-	xfs/296     # wasn't run
-	xfs/301     # new test
-	xfs/302     # new test
+	xfs/007		# sector size math
+	xfs/030		# mkfs.xfs -dsize=100m,agcount=6 fails
+			#  when sunit=swidth=8192
+	xfs/032		# xfs_copy cleans up with pthread_kill (RHBA-2015-0537)
+	xfs/042		# stripe size throws off test's math when filling FS
+	xfs/051
+	xfs/057		# test for IRIX
+	xfs/058		# test for IRIX
+	xfs/069		# _filter_bmap in common/punch parses incorrectly if
+			#  blocks are not stripe-aligned
+	xfs/070		# extra output from xfs_repair
+	xfs/071		# xfs_repair issue on large offsets (RHBA-2015-0537)
+	xfs/073
+	xfs/081		# very small mkfs breaks test with sunit=swidth-8192
+	xfs/095		# not for Linux
+	xfs/096		# checks various mkfs options and chokes on sunit/swidth
+	xfs/104		# can't suppress sunit/swidth warnings on mkfs
+	xfs/109		# can't suppress sunit/swidth warnings on mkfs
+	xfs/167
+	xfs/178		# test explicitly checks for stripe width of 0
+	xfs/191		# tests NFSv4
+	xfs/197		# tests 32-bit machines
+	xfs/205		# very small mkfs breaks tests with sunit=swidth=8192
+	xfs/242		# _filter_bmap in common/punch parses incorrectly if
+			#  blocks are not stripe-aligned
+	xfs/261		# bug in mount_xfs involving creation of new quota files
+	xfs/279		# sector size math (logical v. physical: BZ836433?)
+	xfs/297		# XXX: temporarily expunged due to length
+	xfs/300		# SELinux
 !
 
 ./"${SCRIPT}" -x "$(readlink -f "${EXPUNGE}")" "$@"
-- 
2.39.5