From f09da7ccbc67efd4e1a7ac7f3bc1356fad27fc40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 21 Sep 2018 14:14:45 +0200
Subject: [PATCH] test-seccomp: log function names

Various tests produce similar output, and the function names make it
easier to see where the output is generated.
---
 src/test/test-seccomp.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index 37815af6a44..5b2dfd766eb 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -36,6 +36,8 @@ static void test_seccomp_arch_to_string(void) {
         uint32_t a, b;
         const char *name;
 
+        log_info("/* %s */", __func__);
+
         a = seccomp_arch_native();
         assert_se(a > 0);
         name = seccomp_arch_to_string(a);
@@ -47,6 +49,8 @@ static void test_seccomp_arch_to_string(void) {
 static void test_architecture_table(void) {
         const char *n, *n2;
 
+        log_info("/* %s */", __func__);
+
         NULSTR_FOREACH(n,
                        "native\0"
                        "x86\0"
@@ -75,6 +79,8 @@ static void test_architecture_table(void) {
 }
 
 static void test_syscall_filter_set_find(void) {
+        log_info("/* %s */", __func__);
+
         assert_se(!syscall_filter_set_find(NULL));
         assert_se(!syscall_filter_set_find(""));
         assert_se(!syscall_filter_set_find("quux"));
@@ -89,6 +95,8 @@ static void test_filter_sets(void) {
         unsigned i;
         int r;
 
+        log_info("/* %s */", __func__);
+
         if (!is_seccomp_available()) {
                 log_notice("Seccomp not available, skipping %s", __func__);
                 return;
@@ -136,6 +144,8 @@ static void test_filter_sets(void) {
 static void test_filter_sets_ordered(void) {
         size_t i;
 
+        log_info("/* %s */", __func__);
+
         /* Ensure "@default" always remains at the beginning of the list */
         assert_se(SYSCALL_FILTER_SET_DEFAULT == 0);
         assert_se(streq(syscall_filter_sets[0].name, "@default"));
@@ -168,6 +178,8 @@ static void test_restrict_namespace(void) {
         unsigned long ul;
         pid_t pid;
 
+        log_info("/* %s */", __func__);
+
         assert_se(namespace_flags_to_string(0, &s) == 0 && streq(s, ""));
         s = mfree(s);
         assert_se(namespace_flags_to_string(CLONE_NEWNS, &s) == 0 && streq(s, "mnt"));
@@ -262,6 +274,8 @@ static void test_restrict_namespace(void) {
 static void test_protect_sysctl(void) {
         pid_t pid;
 
+        log_info("/* %s */", __func__);
+
         if (!is_seccomp_available()) {
                 log_notice("Seccomp not available, skipping %s", __func__);
                 return;
@@ -302,6 +316,8 @@ static void test_protect_sysctl(void) {
 static void test_restrict_address_families(void) {
         pid_t pid;
 
+        log_info("/* %s */", __func__);
+
         if (!is_seccomp_available()) {
                 log_notice("Seccomp not available, skipping %s", __func__);
                 return;
@@ -389,6 +405,8 @@ static void test_restrict_address_families(void) {
 static void test_restrict_realtime(void) {
         pid_t pid;
 
+        log_info("/* %s */", __func__);
+
         if (!is_seccomp_available()) {
                 log_notice("Seccomp not available, skipping %s", __func__);
                 return;
@@ -434,6 +452,8 @@ static void test_restrict_realtime(void) {
 static void test_memory_deny_write_execute_mmap(void) {
         pid_t pid;
 
+        log_info("/* %s */", __func__);
+
         if (!is_seccomp_available()) {
                 log_notice("Seccomp not available, skipping %s", __func__);
                 return;
@@ -482,6 +502,8 @@ static void test_memory_deny_write_execute_shmat(void) {
         int shmid;
         pid_t pid;
 
+        log_info("/* %s */", __func__);
+
         if (!is_seccomp_available()) {
                 log_notice("Seccomp not available, skipping %s", __func__);
                 return;
@@ -532,6 +554,8 @@ static void test_memory_deny_write_execute_shmat(void) {
 static void test_restrict_archs(void) {
         pid_t pid;
 
+        log_info("/* %s */", __func__);
+
         if (!is_seccomp_available()) {
                 log_notice("Seccomp not available, skipping %s", __func__);
                 return;
@@ -570,6 +594,8 @@ static void test_restrict_archs(void) {
 static void test_load_syscall_filter_set_raw(void) {
         pid_t pid;
 
+        log_info("/* %s */", __func__);
+
         if (!is_seccomp_available()) {
                 log_notice("Seccomp not available, skipping %s", __func__);
                 return;
@@ -666,6 +692,8 @@ static void test_lock_personality(void) {
         unsigned long current;
         pid_t pid;
 
+        log_info("/* %s */", __func__);
+
         if (!is_seccomp_available()) {
                 log_notice("Seccomp not available, skipping %s", __func__);
                 return;
@@ -714,7 +742,6 @@ static void test_lock_personality(void) {
 }
 
 int main(int argc, char *argv[]) {
-
         test_setup_logging(LOG_DEBUG);
 
         test_seccomp_arch_to_string();