Merge Mesa 21.1.5

2 files changed, 1 insertions, 29 deletions

diff --git a/lib/mesa/src/gallium/tests/unit/SConscript b/lib/mesa/src/gallium/tests/unit/SConscript
deleted file mode 100644
index 446539633..000000000
--- a/lib/mesa/src/gallium/tests/unit/SConscript
+++ /dev/null
@@ -1,29 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-env.Prepend(LIBS = [mesautil, gallium])
-
-if env['platform'] in ('freebsd8', 'sunos'):
-    env.Append(LIBS = ['m'])
-
-if env['platform'] == 'freebsd8':
-    env.Append(LIBS = ['pthread'])
-
-progs = [
-    'pipe_barrier_test',
-    'u_cache_test',
-    'u_half_test',
-    'translate_test'
-]
-
-for progname in progs:
-    prog = env.Program(
-        target = progname,
-        source = progname + '.c',
-    )
-    if progname not in [
-        'u_cache_test', # too long
-        'translate_test', # unreliable
-    ]:
-       env.UnitTest(progname, prog)
diff --git a/lib/mesa/src/gallium/tests/unit/u_cache_test.c b/lib/mesa/src/gallium/tests/unit/u_cache_test.c
index cf8f70ba5..16fb1b865 100644
--- a/lib/mesa/src/gallium/tests/unit/u_cache_test.c
+++ b/lib/mesa/src/gallium/tests/unit/u_cache_test.c
@@ -89,6 +89,7 @@ int main() {
          *key = 0xdeadbeef;
          value_out = (cache_test_value *) util_cache_get(cache, key);
          assert(value_out == NULL);
+         (void)value_out;
          free(key);