Skip to content
Snippets Groups Projects
Commit 403b9650 authored by Simon McVittie's avatar Simon McVittie
Browse files

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: default avatarSimon McVittie <smcv@collabora.com>
parent d45da3f2
No related branches found
No related tags found
1 merge request!62Inspect os-release(5) to see whether we are in a SteamRT container/chroot
...@@ -1706,7 +1706,7 @@ _srt_load_egl_icds (gchar **envp, ...@@ -1706,7 +1706,7 @@ _srt_load_egl_icds (gchar **envp,
* https://github.com/NVIDIA/libglvnd/blob/master/src/EGL/icd_enumeration.md * https://github.com/NVIDIA/libglvnd/blob/master/src/EGL/icd_enumeration.md
* for details of the search order. */ * 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"); value = g_environ_getenv (envp, "__EGL_VENDOR_LIBRARY_FILENAMES");
if (value != NULL) if (value != NULL)
...@@ -2282,7 +2282,7 @@ _srt_load_vulkan_icds (gchar **envp, ...@@ -2282,7 +2282,7 @@ _srt_load_vulkan_icds (gchar **envp,
* documentation is not completely up to date (as of September 2019) * documentation is not completely up to date (as of September 2019)
* so you should also look at the reference implementation. */ * 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"); value = g_environ_getenv (envp, "VK_ICD_FILENAMES");
if (value != NULL) if (value != NULL)
......
...@@ -84,7 +84,7 @@ setup (Fixture *f, ...@@ -84,7 +84,7 @@ setup (Fixture *f,
{ {
tmp = g_build_filename (f->srcdir, "fake-icds", NULL); tmp = g_build_filename (f->srcdir, "fake-icds", NULL);
f->fake_icds_envp = g_environ_setenv (f->fake_icds_envp, 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); g_free (tmp);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment