[PATCH 1/1] lib: Drop cpu-affinity=0 from skin-tests helper

[Aaron Marcher <aaron@sigma-star.at>]

Alchemy, pSos and VxWorks tests assume zero CPU affinity, but we cannot
enforce that in general.

Introduces a parameter to control the arguments.

Signed-off-by: Aaron Marcher <aaron@sigma-star.at>
---
 include/smokey/smokey.h                      | 2 +-
 lib/smokey/helpers.c                         | 8 ++++++--
 testsuite/smokey/alchemytests/alchemytests.c | 3 ++-
 testsuite/smokey/psostests/psostests.c       | 3 ++-
 testsuite/smokey/vxworkstests/vxworkstests.c | 3 ++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/include/smokey/smokey.h b/include/smokey/smokey.h
index 4d0fe011f..3623ba18c 100644
--- a/include/smokey/smokey.h
+++ b/include/smokey/smokey.h
@@ -259,7 +259,7 @@ int smokey_modprobe(const char *name, bool silent);
 
 int smokey_rmmod(const char *name);
 
-int smokey_run_extprog(const char *dir, const char *name, int argc, char *const argv[]);
+int smokey_run_extprog(const char *dir, const char *name, const char *args);
 
 #ifdef __cplusplus
 }
diff --git a/lib/smokey/helpers.c b/lib/smokey/helpers.c
index dfd63b409..99cd019aa 100644
--- a/lib/smokey/helpers.c
+++ b/lib/smokey/helpers.c
@@ -411,12 +411,16 @@ int smokey_rmmod(const char *name)
 	return err;
 }
 
-int smokey_run_extprog(const char *dir, const char *name, int argc, char *const argv[])
+int smokey_run_extprog(const char *dir, const char *name, const char *args)
 {
 	int ret;
 	char *tst_path;
 
-	ret = asprintf(&tst_path, "%s/%s --cpu-affinity=0", dir, name);
+	if (args == NULL)
+		ret = asprintf(&tst_path, "%s/%s", dir, name);
+	else
+		ret = asprintf(&tst_path, "%s/%s %s", dir, name, args);
+
 	if (ret == -1)
 		return -ENOMEM;
 
diff --git a/testsuite/smokey/alchemytests/alchemytests.c b/testsuite/smokey/alchemytests/alchemytests.c
index 5753af423..04f631bac 100644
--- a/testsuite/smokey/alchemytests/alchemytests.c
+++ b/testsuite/smokey/alchemytests/alchemytests.c
@@ -33,12 +33,13 @@ static int run_alchemytests(struct smokey_test *t, int argc, char *const argv[])
 		"alchemytests_task9",
 		"alchemytests_task10"
 	};
+	char *args = "--cpu-affinity=0";
 
 	for (size_t t = 0; t < sizeof(tests) / sizeof(tests[0]); t++)
 	{
 		int fails = 0;
 
-		ret = smokey_run_extprog(XENO_TEST_DIR, tests[t], argc, argv);
+		ret = smokey_run_extprog(XENO_TEST_DIR, tests[t], args);
 		if (ret) {
 			fails++;
 			if (smokey_keep_going)
diff --git a/testsuite/smokey/psostests/psostests.c b/testsuite/smokey/psostests/psostests.c
index a54e6ea31..f2a75c841 100644
--- a/testsuite/smokey/psostests/psostests.c
+++ b/testsuite/smokey/psostests/psostests.c
@@ -46,12 +46,13 @@ static int run_psostests(struct smokey_test *t, int argc, char *const argv[])
 		"psostests_tm6",
 		"psostests_tm7"
 	};
+	char *args = "--cpu-affinity=0";
 
 	for (size_t t = 0; t < sizeof(tests) / sizeof(tests[0]); t++)
 	{
 		int fails = 0;
 
-		ret = smokey_run_extprog(XENO_TEST_DIR, tests[t], argc, argv);
+		ret = smokey_run_extprog(XENO_TEST_DIR, tests[t], args);
 		if (ret) {
 			fails++;
 			if (smokey_keep_going)
diff --git a/testsuite/smokey/vxworkstests/vxworkstests.c b/testsuite/smokey/vxworkstests/vxworkstests.c
index d3ac891ae..24ea8f0a1 100644
--- a/testsuite/smokey/vxworkstests/vxworkstests.c
+++ b/testsuite/smokey/vxworkstests/vxworkstests.c
@@ -24,12 +24,13 @@ static int run_vxworkstests(struct smokey_test *t, int argc, char *const argv[])
 		"vxworkstests_task1",
 		"vxworkstests_task2"
 	};
+	char *args = "--cpu-affinity=0";
 
 	for (size_t t = 0; t < sizeof(tests) / sizeof(tests[0]); t++)
 	{
 		int fails = 0;
 
-		ret = smokey_run_extprog(XENO_TEST_DIR, tests[t], argc, argv);
+		ret = smokey_run_extprog(XENO_TEST_DIR, tests[t], args);
 		if (ret) {
 			fails++;
 			if (smokey_keep_going)
-- 
2.35.3