mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
check: fix -X exclude_file behaviour
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 <ddiss@suse.de> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
committed by
Eryu Guan
parent
03f550bd49
commit
3a9ba205f2
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user