diff options
Diffstat (limited to 'src/regress/lib/libc/sys/t_mmap.c')
-rw-r--r-- | src/regress/lib/libc/sys/t_mmap.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/regress/lib/libc/sys/t_mmap.c b/src/regress/lib/libc/sys/t_mmap.c index 9da88fa9cc..8d167cd5ec 100644 --- a/src/regress/lib/libc/sys/t_mmap.c +++ b/src/regress/lib/libc/sys/t_mmap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t_mmap.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $ */ | 1 | /* $OpenBSD: t_mmap.c,v 1.3 2020/12/06 18:46:07 bluhm Exp $ */ |
2 | /* $NetBSD: t_mmap.c,v 1.14 2020/06/26 07:50:11 jruoho Exp $ */ | 2 | /* $NetBSD: t_mmap.c,v 1.14 2020/06/26 07:50:11 jruoho Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -175,14 +175,22 @@ ATF_TC_BODY(mmap_block, tc) | |||
175 | size_t len; | 175 | size_t len; |
176 | int fd = -1; | 176 | int fd = -1; |
177 | 177 | ||
178 | #ifndef __OpenBSD__ | ||
179 | /* works for us */ | ||
178 | atf_tc_skip("The test case causes a panic " \ | 180 | atf_tc_skip("The test case causes a panic " \ |
179 | "(PR kern/38889, PR kern/46592)"); | 181 | "(PR kern/38889, PR kern/46592)"); |
182 | #endif | ||
180 | 183 | ||
181 | ATF_REQUIRE(sysctl(mib, miblen, NULL, &len, NULL, 0) == 0); | 184 | ATF_REQUIRE(sysctl(mib, miblen, NULL, &len, NULL, 0) == 0); |
182 | drives = malloc(len); | 185 | drives = malloc(len); |
183 | ATF_REQUIRE(drives != NULL); | 186 | ATF_REQUIRE(drives != NULL); |
184 | ATF_REQUIRE(sysctl(mib, miblen, drives, &len, NULL, 0) == 0); | 187 | ATF_REQUIRE(sysctl(mib, miblen, drives, &len, NULL, 0) == 0); |
188 | #ifdef __OpenBSD__ | ||
189 | /* devices separated by comma, disk uid by colon */ | ||
190 | for (dk = strtok(drives, ",:"); dk != NULL; dk = strtok(NULL, ",:")) { | ||
191 | #else | ||
185 | for (dk = strtok(drives, " "); dk != NULL; dk = strtok(NULL, " ")) { | 192 | for (dk = strtok(drives, " "); dk != NULL; dk = strtok(NULL, " ")) { |
193 | #endif | ||
186 | if (strncmp(dk, "dk", 2) == 0) | 194 | if (strncmp(dk, "dk", 2) == 0) |
187 | snprintf(dev, sizeof(dev), _PATH_DEV "%s", dk); | 195 | snprintf(dev, sizeof(dev), _PATH_DEV "%s", dk); |
188 | else | 196 | else |