gnupg22-test-race-agent.diff
gniibe (NIIBE Yutaka)
Actions

Authored By

	• gniibe
	Jun 21 2019, 2:26 AM

Size

993 B

Subscribers

None

gnupg22-test-race-agent.diff
View Options

	diff --git a/agent/command.c b/agent/command.c
	index c24fc80fd..2c7f8f97c 100644
	--- a/agent/command.c
	+++ b/agent/command.c
	@@ -3412,7 +3412,10 @@ start_command_handler (ctrl_t ctrl, gnupg_fd_t listen_fd, gnupg_fd_t fd)
	xfree (ctrl->server_local->import_key);
	xfree (ctrl->server_local->export_key);
	if (ctrl->server_local->stopme)
	- agent_exit (0);
	+ {
	+ sleep (1);
	+ agent_exit (0);
	+ }
	xfree (ctrl->server_local);
	ctrl->server_local = NULL;
	}
	diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
	index 87656a1f3..1e8fa6e87 100644
	--- a/agent/gpg-agent.c
	+++ b/agent/gpg-agent.c
	@@ -2723,6 +2723,7 @@ do_start_connection_thread (ctrl_t ctrl)
	log_info (_("handler 0x%lx for fd %d started\n"),
	(unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));

	+ sleep (2);
	start_command_handler (ctrl, GNUPG_INVALID_FD, ctrl->thread_startup.fd);
	if (opt.verbose && !DBG_IPC)
	log_info (_("handler 0x%lx for fd %d terminated\n"),