diff options
| author | Petri Latvala <petri.latvala@intel.com> | 2017-03-21 14:07:15 +0200 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2017-03-31 12:34:32 +0300 |
| commit | 9f92893b11e83ed9ec71c3084ccb57f74b18705e (patch) | |
| tree | bba8a9ca4a99c181476851a776d1d8dfb5276e28 /lib/igt_kmod.c | |
| parent | 3174974759f5f1d6e2877181c117790ee4dbd68d (diff) | |
lib/igt_kmod: Don't call igt_assert or igt_require without a fixture
If kmod_module_new_from_name fails, igt_kselftest ends up calling
igt_skip (through igt_require) when not in a fixture. Instead return
normally from igt_kselftest, matching behaviour when the module
loading is successful but it doesn't contain selftests.
Also change one igt_assert to a return for the same reason.
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
CC: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/igt_kmod.c')
| -rw-r--r-- | lib/igt_kmod.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c index 4b8ea81a..b366adeb 100644 --- a/lib/igt_kmod.c +++ b/lib/igt_kmod.c @@ -419,7 +419,8 @@ int igt_kselftest_init(struct igt_kselftest *tst, memset(tst, 0, sizeof(*tst)); tst->module_name = strdup(module_name); - igt_assert(tst->module_name); + if (!tst->module_name) + return 1; tst->kmsg = -1; @@ -502,7 +503,9 @@ void igt_kselftests(const char *module_name, IGT_LIST(tests); struct igt_kselftest_list *tl, *tn; - igt_require(igt_kselftest_init(&tst, module_name) == 0); + if (igt_kselftest_init(&tst, module_name) != 0) + return; + igt_fixture igt_require(igt_kselftest_begin(&tst) == 0); |