kdbus-test: assertions now do a single printf and do not expand preprocessor strings

diff --git a/tools/testing/selftests/kdbus/Makefile b/tools/testing/selftests/kdbus/Makefile
index 689f7efda688a3090de85d927a3c1d79c1405d92..174674b075dc8d4383adfaf349028cf928e2e734 100644 (file)
--- a/tools/testing/selftests/kdbus/Makefile
+++ b/tools/testing/selftests/kdbus/Makefile
@@ -34,7 +34,7 @@ all: kdbus-test
 
 include ../lib.mk
 
-%.o: %.c
+%.o: %.c $(wildcard *.h)
        $(CC) $(CFLAGS) -c $< -o $@
 
 kdbus-test: $(OBJS)

diff --git a/tools/testing/selftests/kdbus/kdbus-test.h b/tools/testing/selftests/kdbus/kdbus-test.h
index f2c955ac30045a94ab346badda3c8ec277d56160..e0a6abc65c1f877ab8a6960e4646bed9d4b43b41 100644 (file)
--- a/tools/testing/selftests/kdbus/kdbus-test.h
+++ b/tools/testing/selftests/kdbus/kdbus-test.h
@@ -2,6 +2,7 @@
 #define _TEST_KDBUS_H_
 
 #include <pthread.h>
+#include <sys/syscall.h>
 #include "kdbus-util.h"
 
 struct kdbus_test_env {
@@ -19,8 +20,6 @@ enum {
        TEST_TIME,
 };
 
-extern pthread_mutex_t global_print_lock;
-
 #if 0
        #define print_assert_success print
 #else
@@ -39,33 +38,33 @@ extern pthread_mutex_t global_print_lock;
 #define PRINTF_ARG(...) (_Generic((__VA_ARGS__),\
        default: (__VA_ARGS__)))
 
-#define _ASSERT_REL_(val0, relop, val1, onfailure) do {\
+#define _ASSERT_REL_(val0, val0s, relop, val1, val1s, onfailure) do {\
        __auto_type const _ASSERT_RETURN_VAL_val0_ = (val0);\
        __auto_type const _ASSERT_RETURN_VAL_val1_ = (val1);\
        if (!(_ASSERT_RETURN_VAL_val0_ relop _ASSERT_RETURN_VAL_val1_)) {                       \
-               /* had to partition into multiple print calls because _Generic does not play well with string constant concatenation */\
-               pthread_mutex_lock(&global_print_lock);\
-               print("Assertion '(");\
-                       print(PRINTF_FMT(_ASSERT_RETURN_VAL_val0_), PRINTF_ARG(_ASSERT_RETURN_VAL_val0_));\
-                       print("=%s) %s (", #val0, #relop);\
-                       print(PRINTF_FMT(_ASSERT_RETURN_VAL_val1_), PRINTF_ARG(_ASSERT_RETURN_VAL_val1_));\
-                       print("=%s)' failed in %s(), %s:%d\n", #val1, __func__, __FILE__, __LINE__);\
-               pthread_mutex_unlock(&global_print_lock);\
-               onfailure;      \
+               /* must assemble format string in runtime because _Generic does not play well with string constant concatenation */\
+               char _ASSERT_REL_fmt_[sizeof("[tid %u] Assertion '(")+3+sizeof("=%s) %s (")+3+sizeof("=%s)' failed in %s(), %s:%d\n")];\
+               strcpy(_ASSERT_REL_fmt_, "[tid %u] Assertion '(");\
+               strcat(_ASSERT_REL_fmt_, PRINTF_FMT(_ASSERT_RETURN_VAL_val0_));\
+               strcat(_ASSERT_REL_fmt_, "=%s) %s (");\
+               strcat(_ASSERT_REL_fmt_, PRINTF_FMT(_ASSERT_RETURN_VAL_val1_));\
+               strcat(_ASSERT_REL_fmt_, "=%s)' failed in %s(), %s:%d\n");\
+               print(_ASSERT_REL_fmt_, syscall(SYS_gettid), PRINTF_ARG(_ASSERT_RETURN_VAL_val0_), val0s, #relop, PRINTF_ARG(_ASSERT_RETURN_VAL_val1_), val1s, __func__, __FILE__, __LINE__);\
+               onfailure;\
        }\
-               else print_assert_success("Assertion '%s' SUCCEEDED in %s(), %s:%d\n", #val0 " " #relop " " #val1, __func__, __FILE__, __LINE__);\
+               else print_assert_success("Assertion '%s' SUCCEEDED in %s(), %s:%d\n", val0s " " #relop " " val1s, __func__, __FILE__, __LINE__);\
 } while (0)
 
-#define ASSERT_RETURN_VAL(val0, relop, val1, retval) _ASSERT_REL_(val0, relop, val1, return retval)
-#define ASSERT_EXIT_VAL(val0, relop, val1, exitval) _ASSERT_REL_(val0, relop, val1, exit(exitval))
+#define ASSERT_RETURN_VAL(val0, relop, val1, retval) _ASSERT_REL_(val0, #val0, relop, val1, #val1, return retval)
+#define ASSERT_EXIT_VAL(val0, relop, val1, retval)   _ASSERT_REL_(val0, #val0, relop, val1, #val1, exit(retval))
 
-#define ASSERT_RETURN(val0, relop, val1) ASSERT_RETURN_VAL(val0, relop, val1, TEST_ERR)
-#define ASSERT_EXIT(val0, relop, val1) ASSERT_EXIT_VAL(val0, relop, val1, TEST_ERR)
+#define ASSERT_RETURN(val0, relop, val1) _ASSERT_REL_(val0, #val0, relop, val1, #val1, return TEST_ERR)
+#define ASSERT_EXIT(val0, relop, val1)   _ASSERT_REL_(val0, #val0, relop, val1, #val1, exit(TEST_ERR))
 
-#define ASSERT_ZERO(...)       ASSERT_RETURN((typeof((__VA_ARGS__)))0, ==, (__VA_ARGS__))
-#define ASSERT_NONZERO(...)    ASSERT_RETURN((typeof((__VA_ARGS__)))0, !=, (__VA_ARGS__))
-#define ASSERT_EXIT_ZERO(...)    ASSERT_EXIT((typeof((__VA_ARGS__)))0, ==, (__VA_ARGS__))
-#define ASSERT_EXIT_NONZERO(...) ASSERT_EXIT((typeof((__VA_ARGS__)))0, !=, (__VA_ARGS__))
+#define ASSERT_ZERO(...)         _ASSERT_REL_(((typeof((__VA_ARGS__)))0), "0", ==, (__VA_ARGS__), #__VA_ARGS__, return TEST_ERR)
+#define ASSERT_NONZERO(...)      _ASSERT_REL_(((typeof((__VA_ARGS__)))0), "0", !=, (__VA_ARGS__), #__VA_ARGS__, return TEST_ERR)
+#define ASSERT_EXIT_ZERO(...)    _ASSERT_REL_(((typeof((__VA_ARGS__)))0), "0", ==, (__VA_ARGS__), #__VA_ARGS__, exit(TEST_ERR))
+#define ASSERT_EXIT_NONZERO(...) _ASSERT_REL_(((typeof((__VA_ARGS__)))0), "0", !=, (__VA_ARGS__), #__VA_ARGS__, exit(TEST_ERR))
 
 wur int kdbus_test_activator(struct kdbus_test_env *env);
 wur int kdbus_test_benchmark(struct kdbus_test_env *env);

diff --git a/tools/testing/selftests/kdbus/kdbus-util.h b/tools/testing/selftests/kdbus/kdbus-util.h
index bdcd571b0e52e4c3c85dc2cb18c256d38cb63c43..654adc6f607e934b2ca1fd1509b7c8c0fb64b9e5 100644 (file)
--- a/tools/testing/selftests/kdbus/kdbus-util.h
+++ b/tools/testing/selftests/kdbus/kdbus-util.h
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <stdbool.h>
 #include <linux/kdbus.h>
+#include <sys/wait.h>
 
 /* backwards-incompatible tizen customizations */
 #define TIZEN
@@ -101,31 +102,34 @@ extern int kdbus_util_verbose;
        if (kdbus_util_verbose) \
                print(X)
 
-#define RUN_UNPRIVILEGED(child_uid, child_gid, _child_, _parent_) ASSERT_ZERO(({       \
-               pid_t pid, rpid;                                        \
-               int ret;                                                \
-                                                                       \
-               pid = fork();                                           \
-               if (pid == 0) {                                         \
-                       ret = drop_privileges(child_uid, child_gid);    \
-                       ASSERT_EXIT_VAL(ret,==,0, ret);                 \
-                                                                       \
-                       _child_;                                        \
-                       exit(0);                                        \
-               } else if (pid > 0) {                                   \
-                       _parent_;                                       \
-                       rpid = waitpid(pid, &ret, 0);                   \
-                       ASSERT_RETURN(rpid,==,pid);                     \
-                       ASSERT_NONZERO(WIFEXITED(ret));                 \
-                       ASSERT_ZERO(WEXITSTATUS(ret));          \
-                       ret = TEST_OK;                                  \
-               } else {                                                \
-                       ret = pid;                                      \
-               }                                                       \
-                                                                       \
-               ret;                                                    \
+#define RUN_FORKED(_child_, _parent_) ASSERT_ZERO(({\
+               pid_t pid, rpid;\
+               int ret;\
+               \
+               pid = fork();\
+               if (pid == 0) {\
+                       _child_;\
+                       exit(0);\
+               } else if (pid > 0) {\
+                       _parent_;\
+                       rpid = waitpid(pid, &ret, 0);\
+                       ASSERT_RETURN(rpid,==,pid);\
+                       ASSERT_NONZERO(WIFEXITED(ret));\
+                       ASSERT_ZERO(WEXITSTATUS(ret));\
+                       ret = TEST_OK;\
+               } else {\
+                       ret = pid;\
+               }\
+               \
+               ret;\
        }))
 
+#define RUN_UNPRIVILEGED(child_uid, child_gid, _child_, _parent_) RUN_FORKED(({\
+               ret = drop_privileges(child_uid, child_gid);\
+               ASSERT_EXIT_VAL(ret,==,0, ret);\
+               _child_;\
+       }), _parent_)
+
 #define RUN_UNPRIVILEGED_CONN(_var_, _bus_, _code_)                    \
        RUN_UNPRIVILEGED(UNPRIV_UID, UNPRIV_GID, ({                     \
                struct kdbus_conn *_var_;                               \
@@ -263,4 +267,4 @@ wur int test_is_capable(int cap, ...);
 wur int config_user_ns_is_enabled(void);
 wur int config_auditsyscall_is_enabled(void);
 wur int config_cgroups_is_enabled(void);
-wur int config_security_is_enabled(void);
+wur int config_security_is_enabled(void);
\ No newline at end of file