[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 1/4] tests/qemu-iotests/check: Allow tests withou
From: |
Thomas Huth |
Subject: |
[Qemu-block] [PATCH v2 1/4] tests/qemu-iotests/check: Allow tests without groups |
Date: |
Tue, 16 Jul 2019 14:28:33 +0200 |
The regular expressions in the "check" script currently expect that there
is always a space after the test number in the group file, so you can't
have a test in there without a group unless the line still ends with a
space - which is quite error prone since some editors might remove spaces
at the end of lines automatically.
Thus let's fix the regular expressions so that it is also possible to
have lines with one test number only in the group file.
Suggested-by: Max Reitz <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
tests/qemu-iotests/check | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index f925606cc5..c24874ff4a 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -488,7 +488,7 @@ testlist options
BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
| while read id
do
- if grep -s "^$id " "$source_iotests/group" >/dev/null
+ if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null
then
# in group file ... OK
echo $id >>$tmp.list
@@ -547,7 +547,7 @@ else
touch $tmp.list
else
# no test numbers, do everything from group file
- sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p'
<"$source_iotests/group" >$tmp.list
+ sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p'
<"$source_iotests/group" >$tmp.list
fi
fi
--
2.21.0
- [Qemu-block] [PATCH v2 0/4] Enable iotests during "make check", Thomas Huth, 2019/07/16
- [Qemu-block] [PATCH v2 1/4] tests/qemu-iotests/check: Allow tests without groups,
Thomas Huth <=
- [Qemu-block] [PATCH v2 2/4] tests/qemu-iotests/group: Remove some more tests from the "auto" group, Thomas Huth, 2019/07/16
- Re: [Qemu-block] [PATCH v2 2/4] tests/qemu-iotests/group: Remove some more tests from the "auto" group, Max Reitz, 2019/07/16
- Re: [Qemu-block] [PATCH v2 2/4] tests/qemu-iotests/group: Remove some more tests from the "auto" group, Thomas Huth, 2019/07/16
- Re: [Qemu-block] [PATCH v2 2/4] tests/qemu-iotests/group: Remove some more tests from the "auto" group, Max Reitz, 2019/07/16
- Re: [Qemu-block] [PATCH v2 2/4] tests/qemu-iotests/group: Remove some more tests from the "auto" group, Max Reitz, 2019/07/16
- Re: [Qemu-block] [PATCH v2 2/4] tests/qemu-iotests/group: Remove some more tests from the "auto" group, Eric Blake, 2019/07/16
- Re: [Qemu-block] [PATCH v2 2/4] tests/qemu-iotests/group: Remove some more tests from the "auto" group, Max Reitz, 2019/07/16
- Re: [Qemu-block] [PATCH v2 2/4] tests/qemu-iotests/group: Remove some more tests from the "auto" group, Eric Blake, 2019/07/16