diff options
| author | David Disseldorp <ddiss@suse.de> | 2018-12-19 16:41:55 +0100 |
|---|---|---|
| committer | Eryu Guan <guaneryu@gmail.com> | 2018-12-22 20:51:16 +0800 |
| commit | 3a9ba205f2db2eb190b084274311eea17c2194c9 (patch) | |
| tree | 3ef959cdd66a9b115bce91f7f00c0b020550a7ee /check | |
| parent | 03f550bd493bd0a22f538e28668279fa05d70e6a (diff) | |
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>
Diffstat (limited to 'check')
| -rwxr-xr-x | check | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -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 |