From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Feb 2020 22:05:53 +0000 (-0500)
Subject: Break CONNECTION_TESTCAE_ARG across multiple lines
X-Git-Tag: tor-0.4.5.0-alpha-dev~160^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1651f92c1608c5df2c0e83ae377c86d14499eb34;p=thirdparty%2Ftor.git

Break CONNECTION_TESTCAE_ARG across multiple lines
---

diff --git a/src/test/test_connection.c b/src/test/test_connection.c
index 7ed831f7d8..fca4d884bb 100644
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@ -967,9 +967,14 @@ test_failed_orconn_tracker(void *arg)
 #define CONNECTION_TESTCASE(name, fork, setup)                           \
   { #name, test_conn_##name, fork, &setup, NULL }
 
+#define STR(x) #x
 /* where arg is an expression (constant, variable, compound expression) */
-#define CONNECTION_TESTCASE_ARG(name, fork, setup, arg)                  \
-  { #name "_" #arg, test_conn_##name, fork, &setup, (void *)arg }
+#define CONNECTION_TESTCASE_ARG(name, fork, setup, arg)                 \
+  { #name "_" STR(x),                                                   \
+      test_conn_##name,                                                 \
+      fork,                                                             \
+      &setup,                                                           \
+      (void *)arg }
 #endif /* !defined(COCCI) */
 
 static const unsigned int PROXY_CONNECT_ARG = PROXY_CONNECT;