mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2026-01-23 08:00:24 +01:00
Revert "test: allow for substring matching in the various --filter- arguments"
Substring matching means it's impossible to select filters that are
substrings of others, making it too painful to test one specific filter.
This reverts commit a524cf9761.
Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/984>
This commit is contained in:
parent
c775c23121
commit
34f86489a8
1 changed files with 1 additions and 7 deletions
|
|
@ -383,7 +383,6 @@ litest_add_tcase_no_device(struct suite *suite,
|
|||
const char *test_name = funcname;
|
||||
|
||||
if (filter_device &&
|
||||
strstr(test_name, filter_device) == NULL &&
|
||||
fnmatch(filter_device, test_name, 0) != 0)
|
||||
return;
|
||||
|
||||
|
|
@ -409,7 +408,6 @@ litest_add_tcase_deviceless(struct suite *suite,
|
|||
const char *test_name = funcname;
|
||||
|
||||
if (filter_device &&
|
||||
strstr(test_name, filter_device) == NULL &&
|
||||
fnmatch(filter_device, test_name, 0) != 0)
|
||||
return;
|
||||
|
||||
|
|
@ -475,7 +473,6 @@ litest_add_tcase(const char *filename,
|
|||
litest_assert(excluded >= LITEST_DEVICELESS);
|
||||
|
||||
if (filter_test &&
|
||||
strstr(funcname, filter_test) == NULL &&
|
||||
fnmatch(filter_test, funcname, 0) != 0)
|
||||
return;
|
||||
|
||||
|
|
@ -502,7 +499,6 @@ litest_add_tcase(const char *filename,
|
|||
continue;
|
||||
|
||||
if (filter_device &&
|
||||
strstr(dev->shortname, filter_device) == NULL &&
|
||||
fnmatch(filter_device, dev->shortname, 0) != 0)
|
||||
continue;
|
||||
if ((dev->features & required) != required ||
|
||||
|
|
@ -524,7 +520,6 @@ litest_add_tcase(const char *filename,
|
|||
continue;
|
||||
|
||||
if (filter_device &&
|
||||
strstr(dev->shortname, filter_device) == NULL &&
|
||||
fnmatch(filter_device, dev->shortname, 0) != 0)
|
||||
continue;
|
||||
|
||||
|
|
@ -629,18 +624,17 @@ _litest_add_ranged_for_device(const char *filename,
|
|||
litest_assert(type < LITEST_NO_DEVICE);
|
||||
|
||||
if (filter_test &&
|
||||
strstr(funcname, filter_test) == NULL &&
|
||||
fnmatch(filter_test, funcname, 0) != 0)
|
||||
return;
|
||||
|
||||
create_suite_name(filename, suite_name);
|
||||
|
||||
if (filter_group && fnmatch(filter_group, suite_name, 0) != 0)
|
||||
return;
|
||||
|
||||
s = get_suite(suite_name);
|
||||
list_for_each(dev, &devices, node) {
|
||||
if (filter_device &&
|
||||
strstr(dev->shortname, filter_device) == NULL &&
|
||||
fnmatch(filter_device, dev->shortname, 0) != 0) {
|
||||
device_filtered = true;
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue