Page MenuHomeFreeBSD
Files F177540667

D61460.1794668963.diff
No OneTemporary
Actions

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D61460.1794668963.diff
View Options

diff --git a/tests/sys/kern/module_test.c b/tests/sys/kern/module_test.c
--- a/tests/sys/kern/module_test.c
+++ b/tests/sys/kern/module_test.c
@@ -30,6 +30,7 @@
#include <sys/param.h>
#include <sys/module.h>
#include <errno.h>
+#include <unistd.h>
#include <atf-c.h>
ATF_TC_WITHOUT_HEAD(modfind);
@@ -144,11 +145,14 @@
ATF_REQUIRE(modstat(modid, (struct module_stat *)&ms) == -1);
ATF_REQUIRE(errno == EINVAL);
+ /* Kernels only support module_stat_v1 when compiled with COMPAT_43 */
ms.version = sizeof(ms);
- ATF_REQUIRE(modstat(modid, (struct module_stat *)&ms) == 0);
- ATF_REQUIRE(ms.id == modid);
- if (strnlen(ms.name, sizeof(ms.name)) < sizeof(ms.name))
- ATF_REQUIRE(modfind(ms.name) == modid);
+ if (modstat(modid, (struct module_stat *)&ms) == 0) {
+ ATF_REQUIRE(ms.id == modid);
+ if (strnlen(ms.name, sizeof(ms.name)) < sizeof(ms.name))
+ ATF_REQUIRE(modfind(ms.name) == modid);
+ } else
+ ATF_REQUIRE(errno == EINVAL);
}
ATF_TC_WITHOUT_HEAD(modstat_v2);
@@ -178,10 +182,14 @@
ATF_REQUIRE(errno == EINVAL);
ms.version = sizeof(ms);
- ATF_REQUIRE(modstat(modid, (struct module_stat *)&ms) == 0);
- ATF_REQUIRE(ms.id == modid);
- if (strnlen(ms.name, sizeof(ms.name)) < sizeof(ms.name))
- ATF_REQUIRE(modfind(ms.name) == modid);
+ if (modstat(modid, (struct module_stat *)&ms) == 0) {
+ ATF_REQUIRE(ms.id == modid);
+ if (strnlen(ms.name, sizeof(ms.name)) < sizeof(ms.name))
+ ATF_REQUIRE(modfind(ms.name) == modid);
+ } else {
+ ATF_REQUIRE(!feature_present("compat_freebsd13"));
+ ATF_REQUIRE(errno == EINVAL);
+ }
}
ATF_TP_ADD_TCS(tp)

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 14, 3:09 PM (9 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41708138
Default Alt Text
D61460.1794668963.diff (1 KB)

Event Timeline