check: fix -X exclude_file behaviour

Commit Message

David Disseldorp Dec. 19, 2018, 3:41 p.m. UTC

It is currently processed before FSTYP has been properly set, leading to
xfs, btrfs, etc. specific exclude_files being ignored.

Signed-off-by: David Disseldorp <[e-mail]>
Reviewed-by: Johannes Thumshirn <[e-mail]>
---
 check | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Patch

diff --git a/check b/check
index 59f94c1c..5f8210d7 100755
--- a/check
+++ b/check
@@ -22,6 +22,7 @@  have_test_arg=false
 randomize=false
 export here=`pwd`
 xfile=""
+subdir_xfile=""
 brief_test_summary=false
 do_report=false
 DUMP_OUTPUT=false
@@ -272,13 +273,7 @@  while [ $# -gt 0 ]; do
 		XGROUP_LIST="$XGROUP_LIST ${xgroup//,/ }"
 		;;
 
-	-X)	xfile=$2; shift ;
-		for d in $SRC_GROUPS $FSTYP; do
-			[ -f $SRC_DIR/$d/$xfile ] || continue
-			for f in `sed "s/#.*$//" $SRC_DIR/$d/$xfile`; do
-				echo $d/$f >> $tmp.xlist
-			done
-		done
+	-X)	subdir_xfile=$2; shift ;
 		;;
 	-E)	xfile=$2; shift ;
 		if [ -f $xfile ]; then
@@ -325,6 +320,15 @@  if ! . ./common/rc; then
 	exit 1
 fi
 
+if [ -n "$subdir_xfile" ]; then
+	for d in $SRC_GROUPS $FSTYP; do
+		[ -f $SRC_DIR/$d/$subdir_xfile ] || continue
+		for f in `sed "s/#.*$//" $SRC_DIR/$d/$subdir_xfile`; do
+			echo $d/$f >> $tmp.xlist
+		done
+	done
+fi
+
 # Process tests from command line now.
 if $have_test_arg; then
 	while [ $# -gt 0 ]; do