From 403b96509ded029244cd0a152ea6ab86772477b5 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Wed, 25 Sep 2019 19:53:33 +0100 Subject: [PATCH] tests: Replace SRT_TEST_ICD_SYSROOT with SRT_TEST_SYSROOT I'm about to add a second feature that needs to fake a sysroot for test coverage. Signed-off-by: Simon McVittie <smcv@collabora.com> --- steam-runtime-tools/graphics.c | 4 ++-- tests/graphics.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/steam-runtime-tools/graphics.c b/steam-runtime-tools/graphics.c index 3aeaa1005..615744918 100644 --- a/steam-runtime-tools/graphics.c +++ b/steam-runtime-tools/graphics.c @@ -1706,7 +1706,7 @@ _srt_load_egl_icds (gchar **envp, * https://github.com/NVIDIA/libglvnd/blob/master/src/EGL/icd_enumeration.md * for details of the search order. */ - sysroot = g_environ_getenv (envp, "SRT_TEST_ICD_SYSROOT"); + sysroot = g_environ_getenv (envp, "SRT_TEST_SYSROOT"); value = g_environ_getenv (envp, "__EGL_VENDOR_LIBRARY_FILENAMES"); if (value != NULL) @@ -2282,7 +2282,7 @@ _srt_load_vulkan_icds (gchar **envp, * documentation is not completely up to date (as of September 2019) * so you should also look at the reference implementation. */ - sysroot = g_environ_getenv (envp, "SRT_TEST_ICD_SYSROOT"); + sysroot = g_environ_getenv (envp, "SRT_TEST_SYSROOT"); value = g_environ_getenv (envp, "VK_ICD_FILENAMES"); if (value != NULL) diff --git a/tests/graphics.c b/tests/graphics.c index 7199c5369..f94020b9c 100644 --- a/tests/graphics.c +++ b/tests/graphics.c @@ -84,7 +84,7 @@ setup (Fixture *f, { tmp = g_build_filename (f->srcdir, "fake-icds", NULL); f->fake_icds_envp = g_environ_setenv (f->fake_icds_envp, - "SRT_TEST_ICD_SYSROOT", tmp, TRUE); + "SRT_TEST_SYSROOT", tmp, TRUE); g_free (tmp); } -- GitLab