From 49e1ce7c433e2ff9e5f024c0fa1b47dd62160262 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 2 Dec 2020 15:01:21 +0100
Subject: [PATCH] test/TestUtil: move to test/util/

---
 test/meson.build                       | 19 +------------------
 test/{ => util}/TestCircularBuffer.cxx |  0
 test/{ => util}/TestDivideString.cxx   |  0
 test/{ => util}/TestMimeType.cxx       |  0
 test/{ => util}/TestSplitString.cxx    |  0
 test/{ => util}/TestUriExtract.cxx     |  0
 test/{ => util}/TestUriQueryParser.cxx |  0
 test/{ => util}/TestUriRelative.cxx    |  0
 test/{ => util}/TestUriUtil.cxx        |  0
 test/util/meson.build                  | 20 ++++++++++++++++++++
 test/{ => util}/test_byte_reverse.cxx  |  0
 11 files changed, 21 insertions(+), 18 deletions(-)
 rename test/{ => util}/TestCircularBuffer.cxx (100%)
 rename test/{ => util}/TestDivideString.cxx (100%)
 rename test/{ => util}/TestMimeType.cxx (100%)
 rename test/{ => util}/TestSplitString.cxx (100%)
 rename test/{ => util}/TestUriExtract.cxx (100%)
 rename test/{ => util}/TestUriQueryParser.cxx (100%)
 rename test/{ => util}/TestUriRelative.cxx (100%)
 rename test/{ => util}/TestUriUtil.cxx (100%)
 create mode 100644 test/util/meson.build
 rename test/{ => util}/test_byte_reverse.cxx (100%)

diff --git a/test/meson.build b/test/meson.build
index 014899257..e1b8c5550 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -28,6 +28,7 @@ gtest_dep = declare_dependency(
   compile_args: gtest_compile_args,
 )
 
+subdir('util')
 subdir('net')
 subdir('time')
 
@@ -40,24 +41,6 @@ executable(
   ],
 )
 
-test('TestUtil', executable(
-  'TestUtil',
-  'TestCircularBuffer.cxx',
-  'TestDivideString.cxx',
-  'TestMimeType.cxx',
-  'TestSplitString.cxx',
-  'TestUriExtract.cxx',
-  'TestUriQueryParser.cxx',
-  'TestUriRelative.cxx',
-  'TestUriUtil.cxx',
-  'test_byte_reverse.cxx',
-  include_directories: inc,
-  dependencies: [
-    util_dep,
-    gtest_dep,
-  ],
-))
-
 test('TestRewindInputStream', executable(
   'TestRewindInputStream',
   'TestRewindInputStream.cxx',
diff --git a/test/TestCircularBuffer.cxx b/test/util/TestCircularBuffer.cxx
similarity index 100%
rename from test/TestCircularBuffer.cxx
rename to test/util/TestCircularBuffer.cxx
diff --git a/test/TestDivideString.cxx b/test/util/TestDivideString.cxx
similarity index 100%
rename from test/TestDivideString.cxx
rename to test/util/TestDivideString.cxx
diff --git a/test/TestMimeType.cxx b/test/util/TestMimeType.cxx
similarity index 100%
rename from test/TestMimeType.cxx
rename to test/util/TestMimeType.cxx
diff --git a/test/TestSplitString.cxx b/test/util/TestSplitString.cxx
similarity index 100%
rename from test/TestSplitString.cxx
rename to test/util/TestSplitString.cxx
diff --git a/test/TestUriExtract.cxx b/test/util/TestUriExtract.cxx
similarity index 100%
rename from test/TestUriExtract.cxx
rename to test/util/TestUriExtract.cxx
diff --git a/test/TestUriQueryParser.cxx b/test/util/TestUriQueryParser.cxx
similarity index 100%
rename from test/TestUriQueryParser.cxx
rename to test/util/TestUriQueryParser.cxx
diff --git a/test/TestUriRelative.cxx b/test/util/TestUriRelative.cxx
similarity index 100%
rename from test/TestUriRelative.cxx
rename to test/util/TestUriRelative.cxx
diff --git a/test/TestUriUtil.cxx b/test/util/TestUriUtil.cxx
similarity index 100%
rename from test/TestUriUtil.cxx
rename to test/util/TestUriUtil.cxx
diff --git a/test/util/meson.build b/test/util/meson.build
new file mode 100644
index 000000000..06ee747db
--- /dev/null
+++ b/test/util/meson.build
@@ -0,0 +1,20 @@
+test(
+  'TestUtil',
+  executable(
+    'TestUtil',
+    'TestCircularBuffer.cxx',
+    'TestDivideString.cxx',
+    'TestMimeType.cxx',
+    'TestSplitString.cxx',
+    'TestUriExtract.cxx',
+    'TestUriQueryParser.cxx',
+    'TestUriRelative.cxx',
+    'TestUriUtil.cxx',
+    'test_byte_reverse.cxx',
+    include_directories: inc,
+    dependencies: [
+      util_dep,
+      gtest_dep,
+    ],
+  ),
+)
diff --git a/test/test_byte_reverse.cxx b/test/util/test_byte_reverse.cxx
similarity index 100%
rename from test/test_byte_reverse.cxx
rename to test/util/test_byte_reverse.cxx