[PATCH i-g-t v2 6/7] runner: Use dynamic vector for test argv

[Gustavo Sousa]

With an upcoming update to allow multiple hook options, we need to allow
for a dynamicly sized argument vector in execute_test_process(). Do that
by using a struct igt_vec.

Signed-off-by: Gustavo Sousa <gustavo.sousa at intel.com>
---
 runner/executor.c | 77 +++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/runner/executor.c b/runner/executor.c
index 92dee6e32f6f..a23cd58c0781 100644
--- a/runner/executor.c
+++ b/runner/executor.c
@@ -31,6 +31,7 @@
 #include "igt_aux.h"
 #include "igt_core.h"
 #include "igt_taints.h"
+#include "igt_vec.h"
 #include "executor.h"
 #include "output_strings.h"
 #include "runnercomms.h"
@@ -1506,21 +1507,8 @@ execute_test_process(int outfd, int errfd, int socketfd,
 		     struct settings *settings,
 		     struct job_list_entry *entry)
 {
-	char *arg0;
-	char *arg_run_subtest[2] = {};
-	char *arg_dyn_subtest[2] = {};
-	char *arg_hook[2] = {};
-	char **argv_refs[] = {
-		&arg0,
-		&arg_run_subtest[0],
-		&arg_run_subtest[1],
-		&arg_dyn_subtest[0],
-		&arg_dyn_subtest[1],
-		&arg_hook[0],
-		&arg_hook[1],
-		NULL,
-	};
-	char *argv[sizeof(argv_refs) / sizeof(argv_refs[0])] = {};
+	struct igt_vec arg_vec;
+	char *arg;
 	size_t rootlen;
 
 	dup2(outfd, STDOUT_FILENO);
@@ -1528,32 +1516,31 @@ execute_test_process(int outfd, int errfd, int socketfd,
 
 	setpgid(0, 0);
 
+	igt_vec_init(&arg_vec, sizeof(char *));
+
 	rootlen = strlen(settings->test_root);
-	arg0 = malloc(rootlen + strlen(entry->binary) + 2);
-	strcpy(arg0, settings->test_root);
-	arg0[rootlen] = '/';
-	strcpy(arg0 + rootlen + 1, entry->binary);
+	arg = malloc(rootlen + strlen(entry->binary) + 2);
+	strcpy(arg, settings->test_root);
+	arg[rootlen] = '/';
+	strcpy(arg + rootlen + 1, entry->binary);
+	igt_vec_push(&arg_vec, &arg);
 
 	if (entry->subtest_count) {
 		size_t argsize;
 		const char *dynbegin;
 		size_t i;
 
-		arg_run_subtest[0] = strdup("--run-subtest");
+		arg = strdup("--run-subtest");
+		igt_vec_push(&arg_vec, &arg);
 
 		if ((dynbegin = strchr(entry->subtests[0], '@')) != NULL)
 			argsize = dynbegin - entry->subtests[0];
 		else
 			argsize = strlen(entry->subtests[0]);
 
-		arg_run_subtest[1] = malloc(argsize + 1);
-		memcpy(arg_run_subtest[1], entry->subtests[0], argsize);
-		arg_run_subtest[1][argsize] = '\0';
-
-		if (dynbegin) {
-			arg_dyn_subtest[0] = strdup("--dynamic-subtest");
-			arg_dyn_subtest[1] = strdup(dynbegin + 1);
-		}
+		arg = malloc(argsize + 1);
+		memcpy(arg, entry->subtests[0], argsize);
+		arg[argsize] = '\0';
 
 		for (i = 1; i < entry->subtest_count; i++) {
 			char *sub = entry->subtests[i];
@@ -1561,32 +1548,42 @@ execute_test_process(int outfd, int errfd, int socketfd,
 
 			assert(dynbegin == NULL);
 
-			arg_run_subtest[1] = realloc(arg_run_subtest[1], argsize + sublen + 2);
-			arg_run_subtest[1][argsize] = ',';
-			strcpy(arg_run_subtest[1] + argsize + 1, sub);
+			arg = realloc(arg, argsize + sublen + 2);
+			arg[argsize] = ',';
+			strcpy(arg + argsize + 1, sub);
 			argsize += sublen + 1;
 		}
+
+		igt_vec_push(&arg_vec, &arg);
+
+		if (dynbegin) {
+			arg = strdup("--dynamic-subtest");
+			igt_vec_push(&arg_vec, &arg);
+			arg = strdup(dynbegin + 1);
+			igt_vec_push(&arg_vec, &arg);
+		}
 	}
 
 	if (settings->hook_str) {
-		arg_hook[0] = strdup("--hook");
-		arg_hook[1] = strdup(settings->hook_str);
+		arg = strdup("--hook");
+		igt_vec_push(&arg_vec, &arg);
+		arg = strdup(settings->hook_str);
+		igt_vec_push(&arg_vec, &arg);
 	}
 
-	/* Build argv with only stuff that is set. */
-	for (size_t i = 0, j = 0; argv_refs[i]; i++)
-		if (*argv_refs[i])
-			argv[j++] = *argv_refs[i];
+	arg = NULL;
+	igt_vec_push(&arg_vec, &arg);
 
 	if (socketfd >= 0) {
 		struct runnerpacket *packet;
 
-		packet = runnerpacket_exec(argv);
+		packet = runnerpacket_exec(arg_vec.elems);
 		write(socketfd, packet, packet->size);
 	}
 
-	execv(argv[0], argv);
-	fprintf(stderr, "Cannot execute %s\n", argv[0]);
+	arg = *((char **)igt_vec_elem(&arg_vec, 0));
+	execv(arg, arg_vec.elems);
+	fprintf(stderr, "Cannot execute %s\n", arg);
 	exit(IGT_EXIT_INVALID);
 }
 
-- 
2.45.2