Skip to content

Commit

Permalink
check: Allow partial test names
Browse files Browse the repository at this point in the history
When running ./check and calling a test with a name, id is enough
to find the test (names added in 03c633b).

If the full test path is tests/xfs/123-foo-bar, then all these
invocations should work, as long as the given part of the test name
is valid and the three-digits id is here.

./check xfs/123-foo-bar
./check xfs/123-foo
./check xfs/123

Always use full test name in results.

Signed-off-by: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
  • Loading branch information
jtulak authored and dchinner committed Aug 4, 2015
1 parent 5a18f83 commit 6108261
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 9 deletions.
29 changes: 21 additions & 8 deletions check
Original file line number Diff line number Diff line change
Expand Up @@ -533,14 +533,27 @@ for section in $HOST_OPTIONS_SECTIONS; do

echo -n "$seqnum"

if $showme
then
echo
continue
elif [ ! -f $seq ]
then
echo " - no such test?"
else
if $showme; then
echo
continue
elif [ ! -f $seq ]; then
# Try to get full name in case the user supplied only seq id
# and the test has a name. A bit of hassle to find really
# the test and not its sample output or helping files.
bname=$(basename $seq)
full_seq=$(find $(dirname $seq) -name $bname* -executable |
awk '(NR == 1 || length < length(shortest)) { shortest = $0 }\
END { print shortest }')
if [ -f $full_seq ] \
&& [ x$(echo $bname | grep -o "^$VALID_TEST_ID") != x ]; then
seq=$full_seq
seqnum=${full_seq#*/}
fi
fi

if [ ! -f $seq ]; then
echo " - no such test?"
else
# really going to try and run this one
#
rm -f $seqres.out.bad
Expand Down
3 changes: 2 additions & 1 deletion common/rc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ BC=$(which bc 2> /dev/null) || BC=
# "[[:alnum:]-]*"
# e.g. 999-the-mark-of-fstests
#
VALID_TEST_NAME="[0-9]\{3\}-\?[[:alnum:]-]*"
VALID_TEST_ID="[0-9]\{3\}"
VALID_TEST_NAME="$VALID_TEST_ID-\?[[:alnum:]-]*"

_require_math()
{
Expand Down

0 comments on commit 6108261

Please sign in to comment.