lib: Export a function for loading igtrc

1/4

---
 lib/igt_core.c | 40 +++++++++++++++++++++++++++++++---------
 lib/igt_core.h |  2 ++
 2 files changed, 33 insertions(+), 9 deletions(-)
index 1cbb09f9..940913c1 100644
@@ -642,11 +642,21 @@ static void oom_adjust_for_doom(void)
 
 }
 
-static void common_init_config(void)
+/**
+ * load_igtrc:
+ *
+ * Load .igtrc from the path pointed to by #IGT_CONFIG_PATH or from
+ * home directory if that is not set. The returned keyfile needs to be
+ * deallocated using g_key_file_free().
+ *
+ * Returns: Pointer to the keyfile, NULL on error.
+ */
+GKeyFile *igt_load_igtrc(void)
 {
 	char *key_file_env = NULL;
 	char *key_file_loc = NULL;
 	GError *error = NULL;
+	GKeyFile *file;
 	int ret;
 
 	/* Determine igt config path */

@@ -659,19 +669,35 @@ static void common_init_config(void)
 	}
 
 	/* Load igt config file */
-	igt_key_file = g_key_file_new();
-	ret = g_key_file_load_from_file(igt_key_file, key_file_loc,
+	file = g_key_file_new();
+	ret = g_key_file_load_from_file(file, key_file_loc,
 					G_KEY_FILE_NONE, &error);
 	if (!ret) {
 		g_error_free(error);
-		g_key_file_free(igt_key_file);
-		igt_key_file = NULL;
+		g_key_file_free(file);
+		file = NULL;
 
 		goto out;
 	}
 
 	g_clear_error(&error);
 
+ out:
+	if (!key_file_env && key_file_loc)
+		free(key_file_loc);
+
+	return file;
+}
+
+static void common_init_config(void)
+{
+	GError *error = NULL;
+	int ret;
+
+	igt_key_file = igt_load_igtrc();
+	if (!igt_key_file)
+		return;
+
 	if (!igt_frame_dump_path)
 		igt_frame_dump_path =
 			g_key_file_get_string(igt_key_file, "Common",

@@ -687,10 +713,6 @@ static void common_init_config(void)
 
 	if (ret != 0)
 		igt_set_autoresume_delay(ret);
-
-out:
-	if (!key_file_env && key_file_loc)
-		free(key_file_loc);
 }
 
 static void common_init_env(void)

index 177d2431..521cda10 100644
@@ -83,6 +83,8 @@ extern const char* __igt_test_description __attribute__((weak));
 extern bool __igt_plain_output;
 extern char *igt_frame_dump_path;
 
+struct _GKeyFile *igt_load_igtrc(void);
+
 /**
  * IGT_TEST_DESCRIPTION:
  * @str: description string

2.19.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 meson_options.txt  |   4 ++
 runner/executor.c  | 129 +++++++++++++++++++++++++++++++++++++++++++++
 runner/meson.build |  14 ++++-
 runner/settings.c  |   4 ++
 runner/settings.h  |   5 +-
 5 files changed, 153 insertions(+), 3 deletions(-)
index 8e2e1cf0..ff3abf08 100644
@@ -42,6 +42,10 @@ option('runner',
        type : 'feature',
        description : 'Build test runner')
 
+option('oping',
+       type : 'feature',
+       description : 'Build test runner with liboping for pinging support')
+
 option('use_rpath',
        type : 'boolean',
        value : false,

index 86521f94..6d8d3ab2 100644
@@ -13,6 +13,14 @@ runner_test_sources = [ 'runner_tests.c' ]
 runner_json_test_sources = [ 'runner_json_tests.c' ]
 
 jsonc = dependency('json-c', required: build_runner)
+runner_deps = [jsonc, glib]
+runner_c_args = []
+
+liboping = dependency('liboping', required: get_option('oping'))
+if liboping.found()
+	runner_deps += liboping
+	runner_c_args += '-DHAVE_OPING=1'
+endif
 
 if not build_tests and jsonc.found()
 	error('Building test runner requires building tests')

@@ -23,7 +31,8 @@ if jsonc.found()
 
 	runnerlib = static_library('igt_runner', runnerlib_sources,
 				   include_directories : inc,
-				   dependencies : [jsonc, glib])
+				   c_args : runner_c_args,
+				   dependencies : runner_deps)
 
 	runner = executable('igt_runner', runner_sources,
 			    link_with : runnerlib,

@@ -61,6 +70,9 @@ if jsonc.found()
 	test('runner_json', runner_json_test)
 
 	build_info += 'Build test runner: true'
+	if liboping.found()
+		build_info += 'Build test runner with oping: true'
+	endif
 else
 	build_info += 'Build test runner: false'
 endif

index 8b39c063..d601cd11 100644
@@ -51,6 +51,7 @@ static struct {
 } abort_conditions[] = {
 	{ ABORT_TAINT, "taint" },
 	{ ABORT_LOCKDEP, "lockdep" },
+	{ ABORT_PING, "ping" },
 	{ ABORT_ALL, "all" },
 	{ 0, 0 },
 };

@@ -140,6 +141,9 @@ static const char *usage_str =
 	"                        Possible conditions:\n"
 	"                         lockdep - abort when kernel lockdep has been angered.\n"
 	"                         taint   - abort when kernel becomes fatally tainted.\n"
+	"                         ping    - abort when a host configured in .igtrc or\n"
+	"                                   environment variable IGT_PING_HOSTNAME does\n"
+	"                                   not respond to ping.\n"
 	"                         all     - abort for all of the above.\n"
 	"  -s, --sync            Sync results to disk after every test\n"
 	"  -l {quiet,verbose,dummy}, --log-level {quiet,verbose,dummy}\n"

index 6dcfa8c5..13409f04 100644
@@ -15,9 +15,10 @@ enum {
 
 #define ABORT_TAINT   (1 << 0)
 #define ABORT_LOCKDEP (1 << 1)
-#define ABORT_ALL     (ABORT_TAINT | ABORT_LOCKDEP)
+#define ABORT_PING    (1 << 2)
+#define ABORT_ALL     (ABORT_TAINT | ABORT_LOCKDEP | ABORT_PING)
 
-_Static_assert(ABORT_ALL == (ABORT_TAINT | ABORT_LOCKDEP), "ABORT_ALL must be all conditions bitwise or'd");
+_Static_assert(ABORT_ALL == (ABORT_TAINT | ABORT_LOCKDEP | ABORT_PING), "ABORT_ALL must be all conditions bitwise or'd");
 
 struct regex_list {
 	char **regex_strings;

2.19.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 runner/executor.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
index 6ac95663..5ed191f9 100644
@@ -358,7 +358,7 @@ static char *need_to_abort(const struct settings* settings)
 	for (it = abort_handlers; it->condition; it++) {
 		char *abort;
 
-		if (!(settings->abort_mask & it->condition))
+		if (false && !(settings->abort_mask & it->condition))
 			continue;
 
 		abort = it->handler();

@@ -1475,6 +1475,9 @@ bool execute(struct execute_state *state,
 
 	init_watchdogs(settings);
 
+	if (true || settings->abort_mask & ABORT_PING)
+		ping_config();
+
 	if (!uname(&unamebuf)) {
 		dprintf(unamefd, "%s %s %s %s %s\n",
 			unamebuf.sysname,

2.19.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 runner/executor.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
index 5ed191f9..1d636884 100644
@@ -210,8 +210,12 @@ static bool can_ping(void)
 					       PING_INFO_LATENCY,
 					       &latency,
 					       &len);
-			if (latency >= 0.0)
+			if (latency >= 0.0) {
+				fprintf(stderr,
+					"ping: Successful ping response in %f seconds\n",
+					latency);
 				return true;
+			}
 		}
 	}
 

2.19.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 runner/executor.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
index 5ed191f9..db300e89 100644
@@ -210,8 +210,15 @@ static bool can_ping(void)
 					       PING_INFO_LATENCY,
 					       &latency,
 					       &len);
-			if (latency >= 0.0)
+			if (latency >= 0.0) {
+				fprintf(stderr,
+					"ping: Successful ping response in %f seconds\n",
+					latency);
 				return true;
+			} else {
+				fprintf(stderr,
+					"ping: No response...\n");
+			}
 		}
 	}
 

2.19.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_core.c | 40 +++++++++++++++++++++++++++++++---------
 lib/igt_core.h |  2 ++
 2 files changed, 33 insertions(+), 9 deletions(-)
index 1cbb09f9..940913c1 100644
@@ -642,11 +642,21 @@ static void oom_adjust_for_doom(void)
 
 }
 
-static void common_init_config(void)
+/**
+ * load_igtrc:
+ *
+ * Load .igtrc from the path pointed to by #IGT_CONFIG_PATH or from
+ * home directory if that is not set. The returned keyfile needs to be
+ * deallocated using g_key_file_free().
+ *
+ * Returns: Pointer to the keyfile, NULL on error.
+ */
+GKeyFile *igt_load_igtrc(void)
 {
 	char *key_file_env = NULL;
 	char *key_file_loc = NULL;
 	GError *error = NULL;
+	GKeyFile *file;
 	int ret;
 
 	/* Determine igt config path */

@@ -659,19 +669,35 @@ static void common_init_config(void)
 	}
 
 	/* Load igt config file */
-	igt_key_file = g_key_file_new();
-	ret = g_key_file_load_from_file(igt_key_file, key_file_loc,
+	file = g_key_file_new();
+	ret = g_key_file_load_from_file(file, key_file_loc,
 					G_KEY_FILE_NONE, &error);
 	if (!ret) {
 		g_error_free(error);
-		g_key_file_free(igt_key_file);
-		igt_key_file = NULL;
+		g_key_file_free(file);
+		file = NULL;
 
 		goto out;
 	}
 
 	g_clear_error(&error);
 
+ out:
+	if (!key_file_env && key_file_loc)
+		free(key_file_loc);
+
+	return file;
+}
+
+static void common_init_config(void)
+{
+	GError *error = NULL;
+	int ret;
+
+	igt_key_file = igt_load_igtrc();
+	if (!igt_key_file)
+		return;
+
 	if (!igt_frame_dump_path)
 		igt_frame_dump_path =
 			g_key_file_get_string(igt_key_file, "Common",

@@ -687,10 +713,6 @@ static void common_init_config(void)
 
 	if (ret != 0)
 		igt_set_autoresume_delay(ret);
-
-out:
-	if (!key_file_env && key_file_loc)
-		free(key_file_loc);
 }
 
 static void common_init_env(void)

index 177d2431..521cda10 100644

@@ -83,6 +83,8 @@ extern const char* __igt_test_description __attribute__((weak));
 extern bool __igt_plain_output;
 extern char *igt_frame_dump_path;
 
+struct _GKeyFile *igt_load_igtrc(void);

+
 /**
  * IGT_TEST_DESCRIPTION:
  * @str: description string

2.19.1
---
 lib/igt_core.c | 40 +++++++++++++++++++++++++++++++---------
 lib/igt_core.h |  2 ++
 2 files changed, 33 insertions(+), 9 deletions(-)
index 1cbb09f9..940913c1 100644
@@ -642,11 +642,21 @@ static void oom_adjust_for_doom(void)
 
 }
 
-static void common_init_config(void)
+/**
+ * load_igtrc:
+ *
+ * Load .igtrc from the path pointed to by #IGT_CONFIG_PATH or from
+ * home directory if that is not set. The returned keyfile needs to be
+ * deallocated using g_key_file_free().
+ *
+ * Returns: Pointer to the keyfile, NULL on error.
+ */
+GKeyFile *igt_load_igtrc(void)
 {
 	char *key_file_env = NULL;
 	char *key_file_loc = NULL;
 	GError *error = NULL;
+	GKeyFile *file;
 	int ret;
 
 	/* Determine igt config path */

@@ -659,19 +669,35 @@ static void common_init_config(void)
 	}
 
 	/* Load igt config file */
-	igt_key_file = g_key_file_new();
-	ret = g_key_file_load_from_file(igt_key_file, key_file_loc,
+	file = g_key_file_new();
+	ret = g_key_file_load_from_file(file, key_file_loc,
 					G_KEY_FILE_NONE, &error);
 	if (!ret) {
 		g_error_free(error);
-		g_key_file_free(igt_key_file);
-		igt_key_file = NULL;
+		g_key_file_free(file);
+		file = NULL;
 
 		goto out;
 	}
 
 	g_clear_error(&error);
 
+ out:
+	if (!key_file_env && key_file_loc)
+		free(key_file_loc);
+
+	return file;
+}
+
+static void common_init_config(void)
+{
+	GError *error = NULL;
+	int ret;
+
+	igt_key_file = igt_load_igtrc();
+	if (!igt_key_file)
+		return;
+
 	if (!igt_frame_dump_path)
 		igt_frame_dump_path =
 			g_key_file_get_string(igt_key_file, "Common",

@@ -687,10 +713,6 @@ static void common_init_config(void)
 
 	if (ret != 0)
 		igt_set_autoresume_delay(ret);
-
-out:
-	if (!key_file_env && key_file_loc)
-		free(key_file_loc);
 }
 
 static void common_init_env(void)

index 177d2431..521cda10 100644
@@ -83,6 +83,8 @@ extern const char* __igt_test_description __attribute__((weak));
 extern bool __igt_plain_output;
 extern char *igt_frame_dump_path;
 

+struct _GKeyFile *igt_load_igtrc(void);

Petri Latvala
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_core.c | 40 +++++++++++++++++++++++++++++++---------
 lib/igt_core.h |  2 ++
 2 files changed, 33 insertions(+), 9 deletions(-)
index 1cbb09f9..940913c1 100644
@@ -642,11 +642,21 @@ static void oom_adjust_for_doom(void)
 
 }
 
-static void common_init_config(void)
+/**
+ * load_igtrc:
+ *
+ * Load .igtrc from the path pointed to by #IGT_CONFIG_PATH or from
+ * home directory if that is not set. The returned keyfile needs to be
+ * deallocated using g_key_file_free().
+ *
+ * Returns: Pointer to the keyfile, NULL on error.
+ */
+GKeyFile *igt_load_igtrc(void)
 {
 	char *key_file_env = NULL;
 	char *key_file_loc = NULL;
 	GError *error = NULL;
+	GKeyFile *file;
 	int ret;
 
 	/* Determine igt config path */

@@ -659,19 +669,35 @@ static void common_init_config(void)
 	}
 
 	/* Load igt config file */
-	igt_key_file = g_key_file_new();
-	ret = g_key_file_load_from_file(igt_key_file, key_file_loc,
+	file = g_key_file_new();
+	ret = g_key_file_load_from_file(file, key_file_loc,
 					G_KEY_FILE_NONE, &error);
 	if (!ret) {
 		g_error_free(error);
-		g_key_file_free(igt_key_file);
-		igt_key_file = NULL;
+		g_key_file_free(file);
+		file = NULL;
 
 		goto out;
 	}
 
 	g_clear_error(&error);
 
+ out:
+	if (!key_file_env && key_file_loc)
+		free(key_file_loc);
+
+	return file;
+}
+
+static void common_init_config(void)
+{
+	GError *error = NULL;
+	int ret;
+
+	igt_key_file = igt_load_igtrc();
+	if (!igt_key_file)
+		return;
+
 	if (!igt_frame_dump_path)
 		igt_frame_dump_path =
 			g_key_file_get_string(igt_key_file, "Common",

@@ -687,10 +713,6 @@ static void common_init_config(void)
 
 	if (ret != 0)
 		igt_set_autoresume_delay(ret);
-
-out:
-	if (!key_file_env && key_file_loc)
-		free(key_file_loc);
 }
 
 static void common_init_env(void)

index 177d2431..521cda10 100644
@@ -83,6 +83,8 @@ extern const char* __igt_test_description __attribute__((weak));
 extern bool __igt_plain_output;
 extern char *igt_frame_dump_path;
 

+struct _GKeyFile *igt_load_igtrc(void);

---
 lib/igt_core.c | 40 +++++++++++++++++++++++++++++++---------
 lib/igt_core.h |  2 ++
 2 files changed, 33 insertions(+), 9 deletions(-)
index 1cbb09f9..940913c1 100644
@@ -642,11 +642,21 @@ static void oom_adjust_for_doom(void)
 
 }
 
-static void common_init_config(void)
+/**
+ * load_igtrc:
+ *
+ * Load .igtrc from the path pointed to by #IGT_CONFIG_PATH or from
+ * home directory if that is not set. The returned keyfile needs to be
+ * deallocated using g_key_file_free().
+ *
+ * Returns: Pointer to the keyfile, NULL on error.
+ */
+GKeyFile *igt_load_igtrc(void)
 {
 	char *key_file_env = NULL;
 	char *key_file_loc = NULL;
 	GError *error = NULL;
+	GKeyFile *file;
 	int ret;
 
 	/* Determine igt config path */

@@ -659,19 +669,35 @@ static void common_init_config(void)
 	}
 
 	/* Load igt config file */
-	igt_key_file = g_key_file_new();
-	ret = g_key_file_load_from_file(igt_key_file, key_file_loc,
+	file = g_key_file_new();
+	ret = g_key_file_load_from_file(file, key_file_loc,
 					G_KEY_FILE_NONE, &error);
 	if (!ret) {
 		g_error_free(error);
-		g_key_file_free(igt_key_file);
-		igt_key_file = NULL;
+		g_key_file_free(file);
+		file = NULL;
 
 		goto out;
 	}
 
 	g_clear_error(&error);
 
+ out:
+	if (!key_file_env && key_file_loc)
+		free(key_file_loc);
+
+	return file;
+}
+
+static void common_init_config(void)
+{
+	GError *error = NULL;
+	int ret;
+
+	igt_key_file = igt_load_igtrc();
+	if (!igt_key_file)
+		return;
+
 	if (!igt_frame_dump_path)
 		igt_frame_dump_path =
 			g_key_file_get_string(igt_key_file, "Common",

@@ -687,10 +713,6 @@ static void common_init_config(void)
 
 	if (ret != 0)
 		igt_set_autoresume_delay(ret);
-
-out:
-	if (!key_file_env && key_file_loc)
-		free(key_file_loc);
 }
 
 static void common_init_env(void)

index 177d2431..521cda10 100644

@@ -83,6 +83,8 @@ extern const char* __igt_test_description __attribute__((weak));
 extern bool __igt_plain_output;
 extern char *igt_frame_dump_path;
 
+struct _GKeyFile *igt_load_igtrc(void);

Petri Latvala
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_core.c | 40 +++++++++++++++++++++++++++++++---------
 lib/igt_core.h |  2 ++
 2 files changed, 33 insertions(+), 9 deletions(-)
index 1cbb09f9..940913c1 100644
@@ -642,11 +642,21 @@ static void oom_adjust_for_doom(void)
 
 }
 
-static void common_init_config(void)
+/**
+ * load_igtrc:
+ *
+ * Load .igtrc from the path pointed to by #IGT_CONFIG_PATH or from
+ * home directory if that is not set. The returned keyfile needs to be
+ * deallocated using g_key_file_free().
+ *
+ * Returns: Pointer to the keyfile, NULL on error.
+ */
+GKeyFile *igt_load_igtrc(void)
 {
 	char *key_file_env = NULL;
 	char *key_file_loc = NULL;
 	GError *error = NULL;
+	GKeyFile *file;
 	int ret;
 
 	/* Determine igt config path */

@@ -659,19 +669,35 @@ static void common_init_config(void)
 	}
 
 	/* Load igt config file */
-	igt_key_file = g_key_file_new();
-	ret = g_key_file_load_from_file(igt_key_file, key_file_loc,
+	file = g_key_file_new();
+	ret = g_key_file_load_from_file(file, key_file_loc,
 					G_KEY_FILE_NONE, &error);
 	if (!ret) {
 		g_error_free(error);
-		g_key_file_free(igt_key_file);
-		igt_key_file = NULL;
+		g_key_file_free(file);
+		file = NULL;
 
 		goto out;
 	}
 
 	g_clear_error(&error);
 
+ out:
+	if (!key_file_env && key_file_loc)
+		free(key_file_loc);
+
+	return file;
+}
+
+static void common_init_config(void)
+{
+	GError *error = NULL;
+	int ret;
+
+	igt_key_file = igt_load_igtrc();
+	if (!igt_key_file)
+		return;
+
 	if (!igt_frame_dump_path)
 		igt_frame_dump_path =
 			g_key_file_get_string(igt_key_file, "Common",

@@ -687,10 +713,6 @@ static void common_init_config(void)
 
 	if (ret != 0)
 		igt_set_autoresume_delay(ret);
-
-out:
-	if (!key_file_env && key_file_loc)
-		free(key_file_loc);
 }
 
 static void common_init_env(void)

index 177d2431..521cda10 100644

@@ -83,6 +83,8 @@ extern const char* __igt_test_description __attribute__((weak));
 extern bool __igt_plain_output;
 extern char *igt_frame_dump_path;
 
+struct _GKeyFile *igt_load_igtrc(void);


lib: Export a function for loading igtrc

Petri Latvala

Petri Latvala

Arkadiusz Hiler

Petri Latvala

Petri Latvala

Petri Latvala

Patchwork

Patchwork

Patchwork

Patchwork

Arkadiusz Hiler

Petri Latvala

Arkadiusz Hiler

Petri Latvala

Arkadiusz Hiler