9 files changed, 15 insertions, 15 deletions
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 417038338..350716ad0 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -52,7 +52,7 @@ int test_log_prio = ZLOG_DISABLED;
 /* main routine. */
 int main(int argc, char **argv)
 {
-	struct thread thread;
+	struct event thread;
 	size_t yangcount;
 
 	/* Set umask before anything for security */
diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c
index b841fea25..8b1c222ad 100644
--- a/tests/lib/northbound/test_oper_data.c
+++ b/tests/lib/northbound/test_oper_data.c
@@ -361,7 +361,7 @@ static void vty_do_exit(int isexit)
 /* main routine. */
 int main(int argc, char **argv)
 {
-	struct thread thread;
+	struct event thread;
 	unsigned int num_vrfs = 2;
 	unsigned int num_interfaces = 4;
 	unsigned int num_routes = 6;
diff --git a/tests/lib/test_grpc.cpp b/tests/lib/test_grpc.cpp
index 187b8091d..b274c3d3a 100644
--- a/tests/lib/test_grpc.cpp
+++ b/tests/lib/test_grpc.cpp
@@ -66,7 +66,7 @@ static const struct frr_yang_module_info *const staticd_yang_modules[] = {
 	&frr_staticd_info,   &frr_vrf_info,
 };
 
-static void grpc_thread_stop(struct thread *thread);
+static void grpc_thread_stop(struct event *thread);
 
 static void _err_print(const void *cookie, const char *errstr)
 {
@@ -486,7 +486,7 @@ void *grpc_client_test_start(void *arg)
 	return NULL;
 }
 
-static void grpc_thread_start(struct thread *thread)
+static void grpc_thread_start(struct event *thread)
 {
 	struct frr_pthread_attr client = {
 		.start = grpc_client_test_start,
@@ -498,7 +498,7 @@ static void grpc_thread_start(struct thread *thread)
 	frr_pthread_wait_running(pth);
 }
 
-static void grpc_thread_stop(struct thread *thread)
+static void grpc_thread_stop(struct event *thread)
 {
 	std::cout << __func__ << ": frr_pthread_stop_all" << std::endl;
 	frr_pthread_stop_all();
@@ -545,7 +545,7 @@ int main(int argc, char **argv)
 	thread_add_event(master, grpc_thread_start, NULL, 0, NULL);
 
 	/* Event Loop */
-	struct thread thread;
+	struct event thread;
 	while (thread_fetch(master, &thread))
 		thread_call(&thread);
 	return 0;
diff --git a/tests/lib/test_heavy_thread.c b/tests/lib/test_heavy_thread.c
index 0cee1e863..59da82b2f 100644
--- a/tests/lib/test_heavy_thread.c
+++ b/tests/lib/test_heavy_thread.c
@@ -56,7 +56,7 @@ static void slow_func(struct vty *vty, const char *str, const int i)
 		printf("%s did %d, x = %g\n", str, i, x);
 }
 
-static void clear_something(struct thread *thread)
+static void clear_something(struct event *thread)
 {
 	struct work_state *ws = THREAD_ARG(thread);
 
diff --git a/tests/lib/test_segv.c b/tests/lib/test_segv.c
index 8532da7c2..f4a22930b 100644
--- a/tests/lib/test_segv.c
+++ b/tests/lib/test_segv.c
@@ -49,7 +49,7 @@ void func3(void)
 	func2(6, buf);
 }
 
-static void threadfunc(struct thread *thread)
+static void threadfunc(struct event *thread)
 {
 	func3();
 }
diff --git a/tests/lib/test_sig.c b/tests/lib/test_sig.c
index 897e004b4..b72bf6b1f 100644
--- a/tests/lib/test_sig.c
+++ b/tests/lib/test_sig.c
@@ -36,7 +36,7 @@ struct frr_signal_t sigs[] = {{
 			      }};
 
 struct thread_master *master;
-struct thread t;
+struct event t;
 
 int main(void)
 {
diff --git a/tests/lib/test_timer_correctness.c b/tests/lib/test_timer_correctness.c
index fa197cd1c..b2e3d8de6 100644
--- a/tests/lib/test_timer_correctness.c
+++ b/tests/lib/test_timer_correctness.c
@@ -35,7 +35,7 @@ static char *expected_buf;
 
 static struct prng *prng;
 
-static struct thread **timers;
+static struct event **timers;
 
 static int timers_pending;
 
@@ -63,7 +63,7 @@ static void terminate_test(void)
 	exit(exit_code);
 }
 
-static void timer_func(struct thread *thread)
+static void timer_func(struct event *thread)
 {
 	int rv;
 
@@ -94,7 +94,7 @@ static int cmp_timeval(const void *a, const void *b)
 int main(int argc, char **argv)
 {
 	int i, j;
-	struct thread t;
+	struct event t;
 	struct timeval **alarms;
 
 	master = thread_master_create(NULL);
diff --git a/tests/lib/test_timer_performance.c b/tests/lib/test_timer_performance.c
index 5af0604d1..d4cd65380 100644
--- a/tests/lib/test_timer_performance.c
+++ b/tests/lib/test_timer_performance.c
@@ -22,7 +22,7 @@
 
 struct thread_master *master;
 
-static void dummy_func(struct thread *thread)
+static void dummy_func(struct event *thread)
 {
 }
 
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
 {
 	struct prng *prng;
 	int i;
-	struct thread **timers;
+	struct event **timers;
 	struct timeval tv_start, tv_lap, tv_stop;
 	unsigned long t_schedule, t_remove;
 
diff --git a/tests/lib/test_zmq.c b/tests/lib/test_zmq.c
index 59a596e1c..836819c54 100644
--- a/tests/lib/test_zmq.c
+++ b/tests/lib/test_zmq.c
@@ -264,7 +264,7 @@ static void run_server(int syncfd)
 {
 	void *zmqsock;
 	char dummy = 0;
-	struct thread t;
+	struct event t;
 
 	master = thread_master_create(NULL);
 	signal_init(master, array_size(sigs), sigs);