test/circuitbuild: Refactor test case array

Avoid repeating test names.

Part of 33633.

diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c
index 10d78abc350dff623d91ab157aaa3e4c02535a24..6a83d2f8bd11815b6cb8ecd5ff870e433f393108 100644 (file)
--- a/src/test/test_circuitbuild.c
+++ b/src/test/test_circuitbuild.c
@@ -180,12 +180,17 @@ test_upgrade_from_guard_wait(void *arg)
   entry_guard_free_(guard);
 }
 
+#define TEST(name, flags, setup, cleanup) \
+  { #name, test_ ## name, flags, setup, cleanup }
+
+#define TEST_NEW_ROUTE_LEN(name, flags) \
+  { #name, test_new_route_len_ ## name, flags, NULL, NULL }
+
 struct testcase_t circuitbuild_tests[] = {
-  { "noexit", test_new_route_len_noexit, 0, NULL, NULL },
-  { "safe_exit", test_new_route_len_safe_exit, 0, NULL, NULL },
-  { "unsafe_exit", test_new_route_len_unsafe_exit, 0, NULL, NULL },
-  { "unhandled_exit", test_new_route_len_unhandled_exit, 0, NULL, NULL },
-  { "upgrade_from_guard_wait", test_upgrade_from_guard_wait, TT_FORK,
-    &helper_pubsub_setup, NULL },
+  TEST_NEW_ROUTE_LEN(noexit, 0),
+  TEST_NEW_ROUTE_LEN(safe_exit, 0),
+  TEST_NEW_ROUTE_LEN(unsafe_exit, 0),
+  TEST_NEW_ROUTE_LEN(unhandled_exit, 0),
+  TEST(upgrade_from_guard_wait, TT_FORK, &helper_pubsub_setup, NULL),
   END_OF_TESTCASES
 };