From 976fe1d77c6eb4b13aa2df99f2d99660e2cb6730 Mon Sep 17 00:00:00 2001
From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Date: Fri, 1 Sep 2023 03:03:22 +0300
Subject: [PATCH] util/cache_test: Re-add test for disabled cache

Test for disabled cache was removed when we decoupled
EGL_ANDROID_blob_cache from the disk cache because test was failing
since it became outdated. Add the updated test.

Fixes: 39f26642 ("util: Decouple disk cache from EGL_ANDROID_blob_cache")
Reviewed-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24985>
---
 src/util/tests/cache_test.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/util/tests/cache_test.cpp b/src/util/tests/cache_test.cpp
index 97bff40e6de..1c3485f7063 100644
--- a/src/util/tests/cache_test.cpp
+++ b/src/util/tests/cache_test.cpp
@@ -154,6 +154,16 @@ test_disk_cache_create(void *mem_ctx, const char *cache_dir_name,
    struct disk_cache *cache;
    int err;
 
+   /* Before doing anything else, ensure that with
+    * MESA_SHADER_CACHE_DISABLE set to true, that disk_cache_create returns NO-OP cache.
+    */
+   setenv("MESA_SHADER_CACHE_DISABLE", "true", 1);
+   cache = disk_cache_create("test", driver_id, 0);
+   EXPECT_EQ(cache->type, DISK_CACHE_NONE) << "disk_cache_create with MESA_SHADER_CACHE_DISABLE set";
+   disk_cache_destroy(cache);
+
+   unsetenv("MESA_SHADER_CACHE_DISABLE");
+
 #ifdef SHADER_CACHE_DISABLE_BY_DEFAULT
    /* With SHADER_CACHE_DISABLE_BY_DEFAULT, ensure that with
     * MESA_SHADER_CACHE_DISABLE set to nothing, disk_cache_create returns NULL.