Skip to contentSkip to conversation

tests/file_contexts: refactor existing tests

PATCH Superseded Thiébaud Weksteen 2 participants 4 messages Jul 21 – Jul 22 SELinux security module

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 tests/file_contexts: refactor existing tests

Change the logging format when reporting an error to better capture the location and context of the error.

Split tests into functions to better isolate the tested behaviour.

Format tests using clang-format.

---
 tests/file_contexts/internal.c       | 16 ++---
 tests/file_contexts/internal.h       | 20 +++++-
 tests/file_contexts/test_lookup.c    | 49 ++++++++-------
 tests/file_contexts/test_open.c      | 92 ++++++++++++++++------------
 tests/file_contexts/test_open_base.c | 33 +++++-----
 tests/file_contexts/test_validate.c  | 37 ++++++-----
 6 files changed, 148 insertions(+), 99 deletions(-)
tests/file_contexts/internal.c +9 -7
index 22b5790..ba45dd6 100644
@@ -10,8 +10,8 @@
 
 #include "internal.h"
 
-void assertContextsMatch(struct selabel_handle *hnd, struct test_t *tests,
-			 size_t n)
+void assertContextsMatch(struct selabel_handle *hnd, const char *log_prefix,
+			 struct test_t *tests, size_t n)
 {
 	for (int i = 0; i < n; i++) {
 		char *context = NULL;
@@ -19,20 +19,22 @@ void assertContextsMatch(struct selabel_handle *hnd, struct test_t *tests,
 
 		if (selabel_lookup(hnd, &context, test.path, S_IFREG)) {
 			if (test.context) {
-				perror("file_contexts:selabel_lookup");
-				fprintf(stderr, "Lookup for %s failed\n", test.path);
+				log_errno("Lookup for %s from %s failed",
+					  test.path, log_prefix);
 				exit(2);
 			}
 			// Expected failure. Continue to the next test.
 			continue;
 		} else if (!test.context) {
-			fprintf(stderr, "Lookup for %s was supposed to failed\n", test.path);
+			log_err("Lookup for %s from %s was supposed to failed but got %s",
+				test.path, log_prefix, context);
 			exit(2);
 		}
 
 		if (strcmp(context, tests[i].context)) {
-			fprintf(stderr, "Lookup for %s returned %s, expected %s\n",
-				tests[i].path, context, tests[i].context);
+			log_err("Lookup for %s from %s returned %s, expected %s",
+				tests[i].path, log_prefix, context,
+				tests[i].context);
 			exit(2);
 		}
 
tests/file_contexts/internal.h +17 -3
index a07548f..c51bbc6 100644
@@ -1,8 +1,21 @@
+#include <errno.h>
+#include <string.h>
+
 #include <selinux/label.h>
 #include <selinux/selinux.h>
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
+/* Log an error message with the file name, function name and line */
+#define log_err(fmt, ...)                                                    \
+	fprintf(stderr, "%s:%s:%d: " fmt "\n", __FILE__, __func__, __LINE__, \
+		##__VA_ARGS__)
+
+/* Log an error message as well as errno */
+#define log_errno(fmt, ...)                                            \
+	fprintf(stderr, "%s:%s:%d " fmt " (%s)\n", __FILE__, __func__, \
+		__LINE__, ##__VA_ARGS__, strerror(errno))
+
 /* Structure to capture a test. The |path| will be resolved and expected to
  * match the |context|. If |context| is NULL, the lookup is expected to fail. */
 struct test_t {
@@ -11,6 +24,7 @@ struct test_t {
 };
 
 /* Assert that all paths described in |tests| resolve appropriately. |hnd| must
- * be opened. |n| is the number of tests in |tests|. */
-void assertContextsMatch(struct selabel_handle *hnd, struct test_t *tests,
-			 size_t n);
+ * be opened. |n| is the number of tests in |tests|. |log_prefix| is added to
+ * any log message */
+void assertContextsMatch(struct selabel_handle *hnd, const char *log_prefix,
+			 struct test_t *tests, size_t n);
tests/file_contexts/test_lookup.c +28 -21

66 lines not on this page · raw message

tests/file_contexts/test_open.c +53 -39

134 lines not on this page · raw message

tests/file_contexts/test_open_base.c +19 -14
index 33b0cac..620b0a5 100644
@@ -22,26 +22,29 @@ void test_default_options(const char *basedir)
 
 	char *path;
 	asprintf(&path, "%s/f3.fc", basedir);
-	struct selinux_opt f3_opts[] = {
-		{ .type = SELABEL_OPT_PATH, .value = path }
-	};
+	struct selinux_opt f3_opts[] = { { .type = SELABEL_OPT_PATH,
+					   .value = path } };
 
 	hnd = selabel_open(SELABEL_CTX_FILE, f3_opts, ARRAY_SIZE(f3_opts));
 	free(path);
 
 	if (!hnd) {
-		perror("file_context:f3_default_options");
+		log_errno("Unable to open file backend");
 		exit(2);
 	}
 
 	struct test_t tests[] = {
 		{ .path = "/", .context = "system_u:object_r:rootfs:s0" },
-		{ .path = "/local", .context = "system_u:object_r:test_local:s0" },
-		{ .path = "/homedirs", .context = "system_u:object_r:test_homedirs:s0" },
-		{ .path = "/sub", .context = "system_u:object_r:test_subbed:s0" },
-		{ .path = "/sub_dist", .context = "system_u:object_r:test_subbed:s0" },
+		{ .path = "/local",
+		  .context = "system_u:object_r:test_local:s0" },
+		{ .path = "/homedirs",
+		  .context = "system_u:object_r:test_homedirs:s0" },
+		{ .path = "/sub",
+		  .context = "system_u:object_r:test_subbed:s0" },
+		{ .path = "/sub_dist",
+		  .context = "system_u:object_r:test_subbed:s0" },
 	};
-	assertContextsMatch(hnd, tests, ARRAY_SIZE(tests));
+	assertContextsMatch(hnd, __func__, tests, ARRAY_SIZE(tests));
 
 	selabel_close(hnd);
 }
@@ -62,7 +65,7 @@ void test_base_only_option(const char *basedir)
 	free(path);
 
 	if (!hnd) {
-		perror("file_context:f3_base_only_options");
+		log_errno("Unable to open file backend");
 		exit(2);
 	}
 
@@ -70,10 +73,12 @@ void test_base_only_option(const char *basedir)
 		{ .path = "/", .context = "system_u:object_r:rootfs:s0" },
 		{ .path = "/local", .context = NULL },
 		{ .path = "/homedirs", .context = NULL },
-		{ .path = "/sub", .context = "system_u:object_r:test_subbed:s0" },
-		{ .path = "/sub_dist", .context = "system_u:object_r:test_subbed:s0" },
+		{ .path = "/sub",
+		  .context = "system_u:object_r:test_subbed:s0" },
+		{ .path = "/sub_dist",
+		  .context = "system_u:object_r:test_subbed:s0" },
 	};
-	assertContextsMatch(hnd, tests, ARRAY_SIZE(tests));
+	assertContextsMatch(hnd, __func__, tests, ARRAY_SIZE(tests));
 
 	selabel_close(hnd);
 }
@@ -81,7 +86,7 @@ void test_base_only_option(const char *basedir)
 int main(int argc, char **argv)
 {
 	if (argc != 2) {
-		fprintf(stderr, "basedir not provided\n");
+		log_err("basedir not provided");
 		exit(1);
 	}
 
tests/file_contexts/test_validate.c +22 -15
index 8abefed..aa71c22 100644
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -10,47 +9,55 @@
 
 #include "internal.h"
 
-int main(int argc, char **argv)
+void test_validate_unknown_fails(const char *basedir)
 {
 	char *path;
-	struct selabel_handle *hnd;
-
-	if (argc != 2) {
-		fprintf(stderr, "basedir not provided\n");
-		exit(1);
-	}
-
-	asprintf(&path, "%s/f1.fc", argv[1]);
+	asprintf(&path, "%s/f1.fc", basedir);
 	struct selinux_opt f1_opts[] = {
 		{ .type = SELABEL_OPT_PATH, .value = path },
 		{ .type = SELABEL_OPT_VALIDATE, .value = "1" }
 	};
 
 	/* f1 types are not defined in the test policy. */
-	hnd = selabel_open(SELABEL_CTX_FILE, f1_opts, ARRAY_SIZE(f1_opts));
+	struct selabel_handle *hnd =
+		selabel_open(SELABEL_CTX_FILE, f1_opts, ARRAY_SIZE(f1_opts));
 	free(path);
 
 	if (hnd) {
-		fprintf(stderr, "The validation of f1 should have failed.\n");
+		log_err("The validation of f1 should have failed");
+		selabel_close(hnd);
 		exit(2);
 	}
+}
 
-	asprintf(&path, "%s/f2.fc", argv[1]);
+void test_validate_known_succeeds(const char *basedir)
+{
+	char *path;
+	asprintf(&path, "%s/f2.fc", basedir);
 	struct selinux_opt f2_opts[] = {
 		{ .type = SELABEL_OPT_PATH, .value = path },
 		{ .type = SELABEL_OPT_VALIDATE, .value = "1" }
 	};
 
 	/* f2 types are defined in the test policy. */
-	hnd = selabel_open(SELABEL_CTX_FILE, f2_opts, ARRAY_SIZE(f2_opts));
+	struct selabel_handle *hnd =
+		selabel_open(SELABEL_CTX_FILE, f2_opts, ARRAY_SIZE(f2_opts));
 	free(path);
 
 	if (!hnd) {
-		perror("Unable to read valid file_contexts");
+		log_errno("Unable to read valid file_contexts");
 		exit(2);
 	}
 
 	selabel_close(hnd);
+}
+
+int main(int argc, char **argv)
+{
+	if (argc != 2) {
+		log_err("basedir not provided");
+		exit(1);
+	}
 
 	return 0;
 }
Signature · 1 line
2.55.0.229.g6434b31f56-goog
#1 lore raw

PATCH 2/2 tests/file_contexts: add tests for multiple SELABEL_OPT_PATH

Add unit tests in test_multiple.c to exercise opening the file contexts backend with multiple SELABEL_OPT_PATH options under various validation and path configuration scenarios.

The following test functions were added:
- Verifies opening multiple file contexts without validation.
- Verifies validation failure when contexts contain undefined types.
- Verifies identical contexts across multiple paths validate successfully.
- Verifies conflicting contexts across multiple paths fail validation.
- Verifies extra files (.subs, .local, .homedirs) are processed only for the primary path.
- Verifies context lookups when providing three distinct SELABEL_OPT_PATH options.

---
 tests/file_contexts/Makefile        |   2 +-
 tests/file_contexts/f2_conflict.fc  |   1 +
 tests/file_contexts/f2_same.fc      |   1 +
 tests/file_contexts/test            |   5 +-
 tests/file_contexts/test_multiple.c | 241 ++++++++++++++++++++++++++++
 5 files changed, 248 insertions(+), 2 deletions(-)
 create mode 100644 tests/file_contexts/f2_conflict.fc
 create mode 100644 tests/file_contexts/f2_same.fc
 create mode 100644 tests/file_contexts/test_multiple.c
tests/file_contexts/Makefile +1 -1
index 592a65f..083ef25 100644
@@ -1,4 +1,4 @@
-TARGETS=test_open test_lookup test_open_base test_validate
+TARGETS=test_open test_lookup test_open_base test_validate test_multiple
 CFLAGS += -O2 -Werror -Wall
 LDLIBS += -lselinux
 
tests/file_contexts/f2_conflict.fc new file +1 -0
new file mode 100644
index 0000000..8cc388a
@@ -0,0 +1 @@
+/base             system_u:object_r:test_file_list:s0
tests/file_contexts/f2_same.fc new file +1 -0
new file mode 100644
index 0000000..61a994f
@@ -0,0 +1 @@
+/base             system_u:object_r:test_base_t:s0
tests/file_contexts/test +4 -1
index 1534925..cd7849b 100755
@@ -5,7 +5,7 @@
 
 use Test;
 
-BEGIN { plan tests => 4; }
+BEGIN { plan tests => 5; }
 
 $basedir = $0;
 $basedir =~ s|(.*)/[^/]*|$1|;
@@ -22,4 +22,7 @@ ok( $result, 0 );
 $result = system "$basedir/test_validate $basedir 2>&1";
 ok( $result, 0 );
 
+$result = system "$basedir/test_multiple $basedir 2>&1";
+ok( $result, 0 );
+
 exit;
tests/file_contexts/test_multiple.c new file +241 -0

241 lines not on this page · raw message

Signature · 1 line
2.55.0.229.g6434b31f56-goog
maintainer
#2 lore raw
In reply to Thiébaud Weksteen
Quoted 9 lines · Thiébaud Weksteen

Change the logging format when reporting an error to better capture the location and context of the error.

Split tests into functions to better isolate the tested behaviour.

Format tests using clang-format.

To date, the selinux-testsuite has used tools/check-syntax for formatting and this doesn't match the clang-format. Not fundamentally opposed to migrating the testsuite to match the userspace but that's up to Ondrej/Paul and should likely be done as a separate series on its own.

Quoted 461 lines
---
 tests/file_contexts/internal.c       | 16 ++---
 tests/file_contexts/internal.h       | 20 +++++-
 tests/file_contexts/test_lookup.c    | 49 ++++++++-------
 tests/file_contexts/test_open.c      | 92 ++++++++++++++++------------
 tests/file_contexts/test_open_base.c | 33 +++++-----
 tests/file_contexts/test_validate.c  | 37 ++++++-----
 6 files changed, 148 insertions(+), 99 deletions(-)
tests/file_contexts/internal.c +9 -7
index 22b5790..ba45dd6 100644
@@ -10,8 +10,8 @@
 
 #include "internal.h"
 
-void assertContextsMatch(struct selabel_handle *hnd, struct test_t *tests,
-                        size_t n)
+void assertContextsMatch(struct selabel_handle *hnd, const char *log_prefix,
+                        struct test_t *tests, size_t n)
 {
        for (int i = 0; i < n; i++) {
                char *context = NULL;
@@ -19,20 +19,22 @@ void assertContextsMatch(struct selabel_handle *hnd, struct test_t *tests,
 
                if (selabel_lookup(hnd, &context, test.path, S_IFREG)) {
                        if (test.context) {
-                               perror("file_contexts:selabel_lookup");
-                               fprintf(stderr, "Lookup for %s failed\n", test.path);
+                               log_errno("Lookup for %s from %s failed",
+                                         test.path, log_prefix);
                                exit(2);
                        }
                        // Expected failure. Continue to the next test.
                        continue;
                } else if (!test.context) {
-                       fprintf(stderr, "Lookup for %s was supposed to failed\n", test.path);
+                       log_err("Lookup for %s from %s was supposed to failed but got %s",
+                               test.path, log_prefix, context);
                        exit(2);
                }
 
                if (strcmp(context, tests[i].context)) {
-                       fprintf(stderr, "Lookup for %s returned %s, expected %s\n",
-                               tests[i].path, context, tests[i].context);
+                       log_err("Lookup for %s from %s returned %s, expected %s",
+                               tests[i].path, log_prefix, context,
+                               tests[i].context);
                        exit(2);
                }
 
tests/file_contexts/internal.h +17 -3
index a07548f..c51bbc6 100644
@@ -1,8 +1,21 @@
+#include <errno.h>
+#include <string.h>
+
 #include <selinux/label.h>
 #include <selinux/selinux.h>
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
+/* Log an error message with the file name, function name and line */
+#define log_err(fmt, ...)                                                    \
+       fprintf(stderr, "%s:%s:%d: " fmt "\n", __FILE__, __func__, __LINE__, \
+               ##__VA_ARGS__)
+
+/* Log an error message as well as errno */
+#define log_errno(fmt, ...)                                            \
+       fprintf(stderr, "%s:%s:%d " fmt " (%s)\n", __FILE__, __func__, \
+               __LINE__, ##__VA_ARGS__, strerror(errno))
+
 /* Structure to capture a test. The |path| will be resolved and expected to
  * match the |context|. If |context| is NULL, the lookup is expected to fail. */
 struct test_t {
@@ -11,6 +24,7 @@ struct test_t {
 };
 
 /* Assert that all paths described in |tests| resolve appropriately. |hnd| must
- * be opened. |n| is the number of tests in |tests|. */
-void assertContextsMatch(struct selabel_handle *hnd, struct test_t *tests,
-                        size_t n);
+ * be opened. |n| is the number of tests in |tests|. |log_prefix| is added to
+ * any log message */
+void assertContextsMatch(struct selabel_handle *hnd, const char *log_prefix,
+                        struct test_t *tests, size_t n);
tests/file_contexts/test_lookup.c +28 -21
index 9a54d1d..49bb18b 100644
@@ -9,38 +9,45 @@
 
 #include "internal.h"
 
-int main(int argc, char **argv)
+void test_lookup(const char *basedir)
 {
-       struct selabel_handle *hnd;
-
-       if (argc != 2) {
-               fprintf(stderr, "basedir not provided\n");
-               exit(1);
-       }
-
        char *path;
-       asprintf(&path, "%s/f2.fc", argv[1]);
-       struct selinux_opt f2_opts[] = {
-               { .type = SELABEL_OPT_PATH, .value = path }
-       };
-
-       hnd = selabel_open(SELABEL_CTX_FILE, f2_opts, ARRAY_SIZE(f2_opts));
+       asprintf(&path, "%s/f2.fc", basedir);
+       struct selinux_opt f2_opts[] = { { .type = SELABEL_OPT_PATH,
+                                          .value = path } };
 
+       struct selabel_handle *hnd =
+               selabel_open(SELABEL_CTX_FILE, f2_opts, ARRAY_SIZE(f2_opts));
        free(path);
 
        if (!hnd) {
-               perror("file_context:f2_options");
+               log_errno("Unable to open file backend");
                exit(2);
        }
 
        struct test_t tests[] = {
-               { .path = "/base", .context = "system_u:object_r:test_base_t:s0" },
-               { .path = "/base/unkown", .context = "system_u:object_r:test_base_wildcard_t:s0" },
-               { .path = "/base/sub", .context = "system_u:object_r:test_base_sub_t:s0" },
-               { .path = "/base/file.list", .context = "system_u:object_r:test_file_list_t:s0" },
-               { .path = "/base/file_list", .context = "system_u:object_r:test_base_wildcard_t:s0" },
+               { .path = "/base",
+                 .context = "system_u:object_r:test_base_t:s0" },
+               { .path = "/base/unkown",
+                 .context = "system_u:object_r:test_base_wildcard_t:s0" },
+               { .path = "/base/sub",
+                 .context = "system_u:object_r:test_base_sub_t:s0" },
+               { .path = "/base/file.list",
+                 .context = "system_u:object_r:test_file_list_t:s0" },
+               { .path = "/base/file_list",
+                 .context = "system_u:object_r:test_base_wildcard_t:s0" },
        };
-       assertContextsMatch(hnd, tests, ARRAY_SIZE(tests));
+       assertContextsMatch(hnd, __func__, tests, ARRAY_SIZE(tests));
+}
+
+int main(int argc, char **argv)
+{
+       if (argc != 2) {
+               log_err("basedir not provided");
+               exit(1);
+       }
+
+       test_lookup(argv[1]);
 
        return 0;
 }
tests/file_contexts/test_open.c +53 -39
index eae5691..6bf046d 100644
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -8,75 +7,90 @@
 #include <selinux/label.h>
 #include <selinux/selinux.h>
 
-int main(int argc, char **argv)
+#include "internal.h"
+
+void test_no_options(void)
 {
-       bool has_default_path = false;
-       struct selabel_handle *hnd;
        struct stat default_stat;
+       if (stat(selinux_file_context_path(), &default_stat))
+               return;
 
-       if (argc != 2) {
-               fprintf(stderr, "basedir not provided\n");
-               exit(1);
-       }
+       /* Empty options */
+       struct selabel_handle *hnd = selabel_open(
+               SELABEL_CTX_FILE, /* options= */ NULL, /* nopt= */ 0);
 
-       const char *default_path = selinux_file_context_path();
-       if (!stat(default_path, &default_stat)) {
-               has_default_path = true;
+       if (!hnd) {
+               log_errno("Unable to open default content file");
+               exit(2);
        }
+       selabel_close(hnd);
+}
 
-       if (has_default_path) {
-               /* Empty options */
-               hnd = selabel_open(SELABEL_CTX_FILE, /* options= */ NULL, /* nopt= */ 0);
-
-               if (!hnd) {
-                       perror("file_context:no_options");
-                       exit(2);
-               }
-               selabel_close(hnd);
+void test_null_path(void)
+{
+       struct stat default_stat;
+       if (stat(selinux_file_context_path(), &default_stat))
+               return;
 
-               /* Default options */
-               struct selinux_opt null_opts[] = {
-                       { .type = SELABEL_OPT_PATH, .value = NULL }
-               };
+       /* Default options */
+       struct selinux_opt null_opts[] = { { .type = SELABEL_OPT_PATH,
+                                            .value = NULL } };
 
-               hnd = selabel_open(SELABEL_CTX_FILE, /* options= */ null_opts, /* nopt= */ 1);
+       struct selabel_handle *hnd = selabel_open(SELABEL_CTX_FILE, null_opts,
+                                                 ARRAY_SIZE(null_opts));
 
-               if (!hnd) {
-                       perror("file_context:default_options");
-                       exit(2);
-               }
-               selabel_close(hnd);
+       if (!hnd) {
+               log_errno("Unable to open default content file");
+               exit(2);
        }
+       selabel_close(hnd);
+}
 
+void test_valid_path(const char *basedir)
+{
        /* f1.fc file */
        char *path;
-       asprintf(&path, "%s/f1.fc", argv[1]);
-       struct selinux_opt f1_opts[] = {
-               { .type = SELABEL_OPT_PATH, .value = path }
-       };
+       asprintf(&path, "%s/f1.fc", basedir);
+       struct selinux_opt f1_opts[] = { { .type = SELABEL_OPT_PATH,
+                                          .value = path } };
 
-       hnd = selabel_open(SELABEL_CTX_FILE, /* options= */ f1_opts, /* nopt= */ 1);
+       struct selabel_handle *hnd =
+               selabel_open(SELABEL_CTX_FILE, f1_opts, ARRAY_SIZE(f1_opts));
        free(path);
 
        if (!hnd) {
-               perror("file_context:f1_options");
+               log_errno("Unable to open file backend");
                exit(2);
        }
 
        char *context = NULL;
        if (selabel_lookup(hnd, &context, "/", S_IFREG)) {
-               perror("file_contexts:f1_lookup");
+               log_errno("Unable to lookup \"/\"");
                exit(2);
        }
 
-       if (strcmp(context, "system_u:object_r:rootfs:s0")) {
-               perror("file_contexts:f1_strcmp");
+       const char *expected = "system_u:object_r:rootfs:s0";
+       if (strcmp(context, expected)) {
+               log_err("Incorrect context returned, expected %s got %s",
+                       expected, context);
                exit(2);
        }
 
        free(context);
 
        selabel_close(hnd);
+}
+
+int main(int argc, char **argv)
+{
+       if (argc != 2) {
+               log_err("basedir not provided");
+               exit(1);
+       }
+
+       test_no_options();
+       test_null_path();
+       test_valid_path(argv[1]);
 
        return 0;
 }
tests/file_contexts/test_open_base.c +19 -14
index 33b0cac..620b0a5 100644
@@ -22,26 +22,29 @@ void test_default_options(const char *basedir)
 
        char *path;
        asprintf(&path, "%s/f3.fc", basedir);
-       struct selinux_opt f3_opts[] = {
-               { .type = SELABEL_OPT_PATH, .value = path }
-       };
+       struct selinux_opt f3_opts[] = { { .type = SELABEL_OPT_PATH,
+                                          .value = path } };
 
        hnd = selabel_open(SELABEL_CTX_FILE, f3_opts, ARRAY_SIZE(f3_opts));
        free(path);
 
        if (!hnd) {
-               perror("file_context:f3_default_options");
+               log_errno("Unable to open file backend");
                exit(2);
        }
 
        struct test_t tests[] = {
                { .path = "/", .context = "system_u:object_r:rootfs:s0" },
-               { .path = "/local", .context = "system_u:object_r:test_local:s0" },
-               { .path = "/homedirs", .context = "system_u:object_r:test_homedirs:s0" },
-               { .path = "/sub", .context = "system_u:object_r:test_subbed:s0" },
-               { .path = "/sub_dist", .context = "system_u:object_r:test_subbed:s0" },
+               { .path = "/local",
+                 .context = "system_u:object_r:test_local:s0" },
+               { .path = "/homedirs",
+                 .context = "system_u:object_r:test_homedirs:s0" },
+               { .path = "/sub",
+                 .context = "system_u:object_r:test_subbed:s0" },
+               { .path = "/sub_dist",
+                 .context = "system_u:object_r:test_subbed:s0" },
        };
-       assertContextsMatch(hnd, tests, ARRAY_SIZE(tests));
+       assertContextsMatch(hnd, __func__, tests, ARRAY_SIZE(tests));
 
        selabel_close(hnd);
 }
@@ -62,7 +65,7 @@ void test_base_only_option(const char *basedir)
        free(path);
 
        if (!hnd) {
-               perror("file_context:f3_base_only_options");
+               log_errno("Unable to open file backend");
                exit(2);
        }
 
@@ -70,10 +73,12 @@ void test_base_only_option(const char *basedir)
                { .path = "/", .context = "system_u:object_r:rootfs:s0" },
                { .path = "/local", .context = NULL },
                { .path = "/homedirs", .context = NULL },
-               { .path = "/sub", .context = "system_u:object_r:test_subbed:s0" },
-               { .path = "/sub_dist", .context = "system_u:object_r:test_subbed:s0" },
+               { .path = "/sub",
+                 .context = "system_u:object_r:test_subbed:s0" },
+               { .path = "/sub_dist",
+                 .context = "system_u:object_r:test_subbed:s0" },
        };
-       assertContextsMatch(hnd, tests, ARRAY_SIZE(tests));
+       assertContextsMatch(hnd, __func__, tests, ARRAY_SIZE(tests));
 
        selabel_close(hnd);
 }
@@ -81,7 +86,7 @@ void test_base_only_option(const char *basedir)
 int main(int argc, char **argv)
 {
        if (argc != 2) {
-               fprintf(stderr, "basedir not provided\n");
+               log_err("basedir not provided");
                exit(1);
        }
 
tests/file_contexts/test_validate.c +22 -16
index 8abefed..aa71c22 100644
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -10,47 +9,55 @@
 
 #include "internal.h"
 
-int main(int argc, char **argv)
+void test_validate_unknown_fails(const char *basedir)
 {
        char *path;
-       struct selabel_handle *hnd;
-
-       if (argc != 2) {
-               fprintf(stderr, "basedir not provided\n");
-               exit(1);
-       }
-
-       asprintf(&path, "%s/f1.fc", argv[1]);
+       asprintf(&path, "%s/f1.fc", basedir);
        struct selinux_opt f1_opts[] = {
                { .type = SELABEL_OPT_PATH, .value = path },
                { .type = SELABEL_OPT_VALIDATE, .value = "1" }
        };
 
        /* f1 types are not defined in the test policy. */
-       hnd = selabel_open(SELABEL_CTX_FILE, f1_opts, ARRAY_SIZE(f1_opts));
+       struct selabel_handle *hnd =
+               selabel_open(SELABEL_CTX_FILE, f1_opts, ARRAY_SIZE(f1_opts));
        free(path);
 
        if (hnd) {
-               fprintf(stderr, "The validation of f1 should have failed.\n");
+               log_err("The validation of f1 should have failed");
+               selabel_close(hnd);
                exit(2);
        }
+}
 
-       asprintf(&path, "%s/f2.fc", argv[1]);
+void test_validate_known_succeeds(const char *basedir)
+{
+       char *path;
+       asprintf(&path, "%s/f2.fc", basedir);
        struct selinux_opt f2_opts[] = {
                { .type = SELABEL_OPT_PATH, .value = path },
                { .type = SELABEL_OPT_VALIDATE, .value = "1" }
        };
 
        /* f2 types are defined in the test policy. */
-       hnd = selabel_open(SELABEL_CTX_FILE, f2_opts, ARRAY_SIZE(f2_opts));
+       struct selabel_handle *hnd =
+               selabel_open(SELABEL_CTX_FILE, f2_opts, ARRAY_SIZE(f2_opts));
        free(path);
 
        if (!hnd) {
-               perror("Unable to read valid file_contexts");
+               log_errno("Unable to read valid file_contexts");
                exit(2);
        }
 
        selabel_close(hnd);
+}
+
+int main(int argc, char **argv)
+{
+       if (argc != 2) {
+               log_err("basedir not provided");
+               exit(1);
+       }
 
        return 0;
 }
--

2.55.0.229.g6434b31f56-goog

#3 lore raw
Quoted 10 lines · Stephen Smalley
Quoted 8 lines · Thiébaud Weksteen

Change the logging format when reporting an error to better capture the location and context of the error.

Split tests into functions to better isolate the tested behaviour.

Format tests using clang-format.

Quoted 7 lines
Quoted 1 line

To date, the selinux-testsuite has used tools/check-syntax for formatting and this doesn't match the clang-format. Not fundamentally opposed to migrating the testsuite to match the userspace but that's up to Ondrej/Paul and should likely be done as a separate series on its own.

Sorry for that, I reused my clang-format command from the libselinux patches. I'll update this patch and send a new version.

And yes, +1 to any possible alignment on the formatting. Thanks.