From 68fd9bf534fffe3aa1c4185c6f6c863134375ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Fri, 14 Jan 2022 22:06:18 +0100
Subject: [PATCH] test/utils: Add vararg variant of meta_test_client_do()

To be used by wrapper that puts the error in a g_error().

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2237>
---
 src/tests/meta-test-utils.c | 26 ++++++++++++++++++--------
 src/tests/meta-test-utils.h |  5 +++++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/tests/meta-test-utils.c b/src/tests/meta-test-utils.c
index 24b7106d1..5a1637bcc 100644
--- a/src/tests/meta-test-utils.c
+++ b/src/tests/meta-test-utils.c
@@ -213,15 +213,12 @@ test_client_line_read (GObject      *source,
 }
 
 gboolean
-meta_test_client_do (MetaTestClient  *client,
-                     GError         **error,
-                     ...)
+meta_test_client_dov (MetaTestClient  *client,
+                      GError         **error,
+                      va_list          vap)
 {
   GString *command = g_string_new (NULL);
   char *line = NULL;
-  va_list vap;
-
-  va_start (vap, error);
 
   while (TRUE)
     {
@@ -239,8 +236,6 @@ meta_test_client_do (MetaTestClient  *client,
       g_free (quoted);
     }
 
-  va_end (vap);
-
   g_string_append_c (command, '\n');
 
   if (!g_data_output_stream_put_string (client->in, command->str,
@@ -287,6 +282,21 @@ meta_test_client_do (MetaTestClient  *client,
   return *error == NULL;
 }
 
+gboolean
+meta_test_client_do (MetaTestClient  *client,
+                     GError         **error,
+                     ...)
+{
+  va_list vap;
+  gboolean retval;
+
+  va_start (vap, error);
+  retval = meta_test_client_dov (client, error, vap);
+  va_end (vap);
+
+  return retval;
+}
+
 gboolean
 meta_test_client_wait (MetaTestClient  *client,
                        GError         **error)
diff --git a/src/tests/meta-test-utils.h b/src/tests/meta-test-utils.h
index 608d57ae3..20c714998 100644
--- a/src/tests/meta-test-utils.h
+++ b/src/tests/meta-test-utils.h
@@ -73,6 +73,11 @@ META_EXPORT
 gboolean meta_test_client_wait (MetaTestClient  *client,
                                 GError         **error);
 
+META_EXPORT
+gboolean meta_test_client_dov (MetaTestClient  *client,
+                               GError         **error,
+                               va_list          vap);
+
 META_EXPORT
 gboolean meta_test_client_do (MetaTestClient  *client,
                               GError         **error,