Commit | Line | Data |
---|---|---|
8b555442 LF |
1 | disk_cache_create() here looks up the users home directory from <pwd.h> |
2 | which resolves to "/" in the build environment. I could not find an easy | |
3 | way to set the home directory to something else, so we disable this test | |
4 | for now. | |
5 | ||
6 | --- a/src/compiler/glsl/tests/cache_test.c | |
7 | +++ b/src/compiler/glsl/tests/cache_test.c | |
8 | @@ -170,11 +170,6 @@ | |
9 | unsetenv("MESA_GLSL_CACHE_DIR"); | |
10 | unsetenv("XDG_CACHE_HOME"); | |
11 | ||
12 | - cache = disk_cache_create("test", "make_check", 0); | |
13 | - expect_non_null(cache, "disk_cache_create with no environment variables"); | |
14 | - | |
15 | - disk_cache_destroy(cache); | |
16 | - | |
17 | /* Test with XDG_CACHE_HOME set */ | |
18 | setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1); | |
19 | cache = disk_cache_create("test", "make_check", 0); | |
20 | ||
21 | This test fails on i686-linux. I couldn't come up with a regex that | |
22 | could be used to disable it just on i686-linux, so we disable it | |
23 | completely with this patch: | |
24 | ||
25 | https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091 | |
26 | ||
27 | diff --git a/src/util/meson.build b/src/util/meson.build | |
28 | index 0893f64..909b3e0 100644 | |
29 | --- a/src/util/meson.build | |
30 | +++ b/src/util/meson.build | |
31 | @@ -289,18 +289,6 @@ if with_tests | |
32 | suite : ['util'], | |
33 | ) | |
34 | ||
35 | - test( | |
36 | - 'u_debug_stack', | |
37 | - executable( | |
38 | - 'u_debug_stack_test', | |
39 | - files('u_debug_stack_test.cpp'), | |
40 | - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], | |
41 | - dependencies : [idep_mesautil, idep_gtest], | |
42 | - c_args : [c_msvc_compat_args], | |
43 | - ), | |
44 | - suite : ['util'], | |
45 | - ) | |
46 | - | |
47 | process_test_exe = executable( | |
48 | 'process_test', | |
49 | files('process_test.c'), |