diff options
| -rw-r--r-- | lib/igt_core.c | 12 | ||||
| -rw-r--r-- | lib/igt_core.h | 2 | ||||
| -rw-r--r-- | lib/igt_frame.c | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c index ff6d19fc..9f4ee68b 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -295,7 +295,7 @@ static pthread_mutex_t log_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; GKeyFile *igt_key_file; #endif -char *frame_dump_path; +char *igt_frame_dump_path; const char *igt_test_name(void) { @@ -650,10 +650,10 @@ static void common_init_config(void) g_clear_error(&error); - if (!frame_dump_path) - frame_dump_path = g_key_file_get_string(igt_key_file, "Common", - "FrameDumpPath", - &error); + if (!igt_frame_dump_path) + igt_frame_dump_path = + g_key_file_get_string(igt_key_file, "Common", + "FrameDumpPath", &error); g_clear_error(&error); @@ -694,7 +694,7 @@ static void common_init_env(void) igt_log_level = IGT_LOG_NONE; } - frame_dump_path = getenv("IGT_FRAME_DUMP_PATH"); + igt_frame_dump_path = getenv("IGT_FRAME_DUMP_PATH"); } static int common_init(int *argc, char **argv, diff --git a/lib/igt_core.h b/lib/igt_core.h index 22b8c223..c90ae2de 100644 --- a/lib/igt_core.h +++ b/lib/igt_core.h @@ -50,7 +50,7 @@ extern const char* __igt_test_description __attribute__((weak)); extern bool __igt_plain_output; extern GKeyFile *igt_key_file; -extern char *frame_dump_path; +extern char *igt_frame_dump_path; /** * IGT_TEST_DESCRIPTION: diff --git a/lib/igt_frame.c b/lib/igt_frame.c index 222a45f8..0f6bca24 100644 --- a/lib/igt_frame.c +++ b/lib/igt_frame.c @@ -53,7 +53,7 @@ */ bool igt_frame_dump_is_enabled(void) { - return frame_dump_path != NULL; + return igt_frame_dump_path != NULL; } static void igt_write_frame_to_png(cairo_surface_t *surface, int fd, @@ -70,11 +70,11 @@ static void igt_write_frame_to_png(cairo_surface_t *surface, int fd, if (suffix) snprintf(path, PATH_MAX, "%s/frame-%s-%s-%s-%s.png", - frame_dump_path, test_name, subtest_name, qualifier, + igt_frame_dump_path, test_name, subtest_name, qualifier, suffix); else snprintf(path, PATH_MAX, "%s/frame-%s-%s-%s.png", - frame_dump_path, test_name, subtest_name, qualifier); + igt_frame_dump_path, test_name, subtest_name, qualifier); igt_debug("Dumping %s frame to %s...\n", qualifier, path); @@ -122,10 +122,10 @@ void igt_write_compared_frames_to_png(cairo_surface_t *reference, if (id) snprintf(path, PATH_MAX, "%s/frame-%s-%s-%s.txt", - frame_dump_path, test_name, subtest_name, id); + igt_frame_dump_path, test_name, subtest_name, id); else snprintf(path, PATH_MAX, "%s/frame-%s-%s.txt", - frame_dump_path, test_name, subtest_name); + igt_frame_dump_path, test_name, subtest_name); fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644); igt_assert(fd >= 0); |