Mesa (main): util: Move tests in single file directories to tests/

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 1d78a31bec96e94c6dee6514eac49706a1ee20b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d78a31bec96e94c6dee6514eac49706a1ee20b3

Author: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Date:   Mon Oct 18 14:00:14 2021 -0700

util: Move tests in single file directories to tests/

Acked-by: Emma Anholt <emma at anholt.net>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Acked-by: Matt Turner <mattst88 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13425>

---

 src/util/meson.build                                         | 12 ++++++------
 .../{fast_idiv_by_const => }/fast_idiv_by_const_test.cpp     |  0
 .../{fast_urem_by_const => }/fast_urem_by_const_test.cpp     |  0
 src/util/tests/{set => }/set_test.cpp                        |  0
 src/util/tests/{string_buffer => }/string_buffer_test.cpp    |  0
 src/util/tests/{timespec => }/timespec_test.cpp              |  0
 src/util/tests/{vector => }/vector_test.cpp                  |  0
 7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/util/meson.build b/src/util/meson.build
index 8e1ffbaf3a9..1f51ec5de8a 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -362,11 +362,11 @@ if with_tests
     'bitset_test.cpp',
     'register_allocate_test.cpp',
     'tests/dag_test.cpp',
-    'tests/fast_idiv_by_const/fast_idiv_by_const_test.cpp',
-    'tests/fast_urem_by_const/fast_urem_by_const_test.cpp',
+    'tests/fast_idiv_by_const_test.cpp',
+    'tests/fast_urem_by_const_test.cpp',
     'tests/int_min_max.cpp',
-    'tests/set/set_test.cpp',
-    'tests/vector/vector_test.cpp',
+    'tests/set_test.cpp',
+    'tests/vector_test.cpp',
     'u_debug_stack_test.cpp',
     'u_qsort_test.cpp',
   )
@@ -374,13 +374,13 @@ if with_tests
   if not (host_machine.system() == 'windows' and cc.get_id() == 'gcc')
     # FIXME: These tests fail with mingw, but not with msvc.
     files_util_tests += files(
-      'tests/string_buffer/string_buffer_test.cpp',
+      'tests/string_buffer_test.cpp',
     )
   endif
 
   if cc.has_header('sys/time.h')  # MinGW has this, but Vanilla windows doesn't
     files_util_tests += files(
-      'tests/timespec/timespec_test.cpp'
+      'tests/timespec_test.cpp'
     )
   endif
 
diff --git a/src/util/tests/fast_idiv_by_const/fast_idiv_by_const_test.cpp b/src/util/tests/fast_idiv_by_const_test.cpp
similarity index 100%
rename from src/util/tests/fast_idiv_by_const/fast_idiv_by_const_test.cpp
rename to src/util/tests/fast_idiv_by_const_test.cpp
diff --git a/src/util/tests/fast_urem_by_const/fast_urem_by_const_test.cpp b/src/util/tests/fast_urem_by_const_test.cpp
similarity index 100%
rename from src/util/tests/fast_urem_by_const/fast_urem_by_const_test.cpp
rename to src/util/tests/fast_urem_by_const_test.cpp
diff --git a/src/util/tests/set/set_test.cpp b/src/util/tests/set_test.cpp
similarity index 100%
rename from src/util/tests/set/set_test.cpp
rename to src/util/tests/set_test.cpp
diff --git a/src/util/tests/string_buffer/string_buffer_test.cpp b/src/util/tests/string_buffer_test.cpp
similarity index 100%
rename from src/util/tests/string_buffer/string_buffer_test.cpp
rename to src/util/tests/string_buffer_test.cpp
diff --git a/src/util/tests/timespec/timespec_test.cpp b/src/util/tests/timespec_test.cpp
similarity index 100%
rename from src/util/tests/timespec/timespec_test.cpp
rename to src/util/tests/timespec_test.cpp
diff --git a/src/util/tests/vector/vector_test.cpp b/src/util/tests/vector_test.cpp
similarity index 100%
rename from src/util/tests/vector/vector_test.cpp
rename to src/util/tests/vector_test.cpp