Page MenuHomeFreeBSD
Files F163418327

D58322.diff
No OneTemporary
Actions

D58322.diff
View Options

diff --git a/tests/sys/kern/exterr_test.c b/tests/sys/kern/exterr_test.c
--- a/tests/sys/kern/exterr_test.c
+++ b/tests/sys/kern/exterr_test.c
@@ -30,6 +30,20 @@
#include <errno.h>
#include <exterr.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+/*
+ * Pin the message format by clearing EXTERROR_VERBOSE, which would
+ * otherwise change the output shape.
+ */
+static void
+pin_exterror_format(void)
+{
+
+ unsetenv("EXTERROR_VERBOSE");
+}
ATF_TC(gettext_extended);
ATF_TC_HEAD(gettext_extended, tc)
@@ -41,6 +55,8 @@
char exterr[UEXTERROR_MAXLEN];
int r;
+ pin_exterror_format();
+
/*
* Use an invalid call to mmap() because it supports extended error
* messages, requires no special resources, and does not need root.
@@ -50,8 +66,10 @@
r = uexterr_gettext(exterr, sizeof(exterr));
ATF_CHECK_EQ(0, r);
printf("Extended error: %s\n", exterr);
+ if (feature_present("exterr_strings") == 0)
+ atf_tc_skip("kernel built without EXTERR_STRINGS");
/* Note: error string may need to be updated due to kernel changes */
- ATF_CHECK(strstr(exterr, " is not subset of ") != 0);
+ ATF_CHECK(strstr(exterr, " is not subset of ") != NULL);
}
ATF_TC(gettext_noextended);
@@ -65,6 +83,8 @@
char exterr[UEXTERROR_MAXLEN];
int r;
+ pin_exterror_format();
+
ATF_CHECK_ERRNO(EINVAL, exterrctl(EXTERRCTL_UD, 0, NULL));
r = uexterr_gettext(exterr, sizeof(exterr));
ATF_CHECK_EQ(0, r);
@@ -82,6 +102,8 @@
char exterr[UEXTERROR_MAXLEN];
int r;
+ pin_exterror_format();
+
/*
* First do something that will create an extended error message, but
* ignore it.

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 24, 1:18 AM (18 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35271228
Default Alt Text
D58322.diff (1 KB)

Event Timeline