Mesa (master): util/disk_cache: fix make check

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: 6b657cecd52649b1a8735cd143998280cfa130f3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b657cecd52649b1a8735cd143998280cfa130f3

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Mon Mar  6 13:25:59 2017 +1100

util/disk_cache: fix make check

Fixes make check after 11f0efec2e615f5233d which caused disk cache
to create an additional directory.

---

 src/compiler/glsl/tests/cache_test.c | 19 ++++++++++++-------
 src/util/disk_cache.c                | 17 -----------------
 src/util/disk_cache.h                | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c
index de92e5a..7a1ff0a 100644
--- a/src/compiler/glsl/tests/cache_test.c
+++ b/src/compiler/glsl/tests/cache_test.c
@@ -127,7 +127,7 @@ rmrf_local(const char *path)
 }
 
 static void
-check_timestamp_and_gpu_id_directories_created(const char *cache_dir)
+check_timestamp_and_gpu_id_directories_created(char *cache_dir)
 {
    bool sub_dirs_created = false;
 
@@ -180,13 +180,16 @@ test_disk_cache_create(void)
    expect_null(cache, "disk_cache_create with XDG_CACHE_HOME set with"
                "a non-existing parent directory");
 
+   /* Create string with expected directory hierarchy */
+   char expected_dir_h[255];
+   sprintf(expected_dir_h, "%s%s%s", CACHE_TEST_TMP "/xdg-cache-home/mesa/",
+           get_arch_bitness_str(), "/make_check/test");
+
    mkdir(CACHE_TEST_TMP, 0755);
    cache = disk_cache_create("test", "make_check");
    expect_non_null(cache, "disk_cache_create with XDG_CACHE_HOME set");
 
-   check_timestamp_and_gpu_id_directories_created(CACHE_TEST_TMP
-                                                  "/xdg-cache-home"
-                                                  "/mesa/make_check/test");
+   check_timestamp_and_gpu_id_directories_created(expected_dir_h);
 
    disk_cache_destroy(cache);
 
@@ -199,13 +202,15 @@ test_disk_cache_create(void)
    expect_null(cache, "disk_cache_create with MESA_GLSL_CACHE_DIR set with"
                "a non-existing parent directory");
 
+   sprintf(expected_dir_h, "%s%s%s", CACHE_TEST_TMP
+           "/mesa-glsl-cache-dir/mesa/", get_arch_bitness_str(),
+           "/make_check/test");
+
    mkdir(CACHE_TEST_TMP, 0755);
    cache = disk_cache_create("test", "make_check");
    expect_non_null(cache, "disk_cache_create with MESA_GLSL_CACHE_DIR set");
 
-   check_timestamp_and_gpu_id_directories_created(CACHE_TEST_TMP
-                                                  "/mesa-glsl-cache-dir"
-                                                  "/mesa/make_check/test");
+   check_timestamp_and_gpu_id_directories_created(expected_dir_h);
 
    disk_cache_destroy(cache);
 }
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 9a7c5c9..31a9336 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -74,23 +74,6 @@ struct disk_cache {
    uint64_t max_size;
 };
 
-static const char *
-get_arch_bitness_str(void)
-{
-    if (sizeof(void *) == 4)
-#ifdef __ILP32__
-        return "ilp-32";
-#else
-        return "32";
-#endif
-    if (sizeof(void *) == 8)
-        return "64";
-
-    /* paranoia check which will be dropped by the optimiser */
-    assert(!"unknown_arch");
-    return "unknown_arch";
-}
-
 /* Create a directory named 'path' if it does not already exist.
  *
  * Returns: 0 if path already exists as a directory or if created.
diff --git a/src/util/disk_cache.h b/src/util/disk_cache.h
index 63ab9b3..3659b6d 100644
--- a/src/util/disk_cache.h
+++ b/src/util/disk_cache.h
@@ -27,6 +27,7 @@
 #ifdef ENABLE_SHADER_CACHE
 #include <dlfcn.h>
 #endif
+#include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/stat.h>
@@ -42,6 +43,23 @@ typedef uint8_t cache_key[CACHE_KEY_SIZE];
 
 struct disk_cache;
 
+static inline const char *
+get_arch_bitness_str(void)
+{
+    if (sizeof(void *) == 4)
+#ifdef __ILP32__
+        return "ilp-32";
+#else
+        return "32";
+#endif
+    if (sizeof(void *) == 8)
+        return "64";
+
+    /* paranoia check which will be dropped by the optimiser */
+    assert(!"unknown_arch");
+    return "unknown_arch";
+}
+
 static inline bool
 disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp)
 {