From 13c8879305912e99b4fc3071ad6ba9b542b468f5 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Tue, 2 Nov 2021 22:12:15 +0200
Subject: [PATCH] mu: move test sources to tests/

---
 mu/Makefile.am                      | 10 +++++++---
 mu/meson.build                      | 13 ++++++++++---
 mu/{ => tests}/test-mu-cmd-cfind.cc |  0
 mu/{ => tests}/test-mu-cmd.cc       |  0
 mu/{ => tests}/test-mu-query.cc     |  0
 5 files changed, 17 insertions(+), 6 deletions(-)
 rename mu/{ => tests}/test-mu-cmd-cfind.cc (100%)
 rename mu/{ => tests}/test-mu-cmd.cc (100%)
 rename mu/{ => tests}/test-mu-query.cc (100%)

diff --git a/mu/Makefile.am b/mu/Makefile.am
index d2fccabd..902cb2eb 100644
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@@ -68,6 +68,10 @@ EXTRA_DIST=                                                     \
 	mu-help-strings.awk                                     \
 	mu-help-strings.txt
 
+#
+# Tests
+#
+
 noinst_PROGRAMS= $(TEST_PROGS)
 
 test_cxxflags=                                                  \
@@ -80,17 +84,17 @@ test_cxxflags=                                                  \
 	-DABS_SRCDIR=\"${abs_srcdir}\"
 
 TEST_PROGS += test-query
-test_query_SOURCES= test-mu-query.cc
+test_query_SOURCES= tests/test-mu-query.cc
 test_query_CXXFLAGS=$(test_cxxflags)
 test_query_LDADD=${top_builddir}/lib/libtestmucommon.la $(CODE_COVERAGE_LIBS)
 
 TEST_PROGS += test-cmd
-test_cmd_SOURCES= test-mu-cmd.cc
+test_cmd_SOURCES= tests/test-mu-cmd.cc
 test_cmd_CXXFLAGS=$(test_cxxflags)
 test_cmd_LDADD=${top_builddir}/lib/libtestmucommon.la $(CODE_COVERAGE_LIBS)
 
 TEST_PROGS += test-cmd-cfind
-test_cmd_cfind_SOURCES= test-mu-cmd-cfind.cc
+test_cmd_cfind_SOURCES= tests/test-mu-cmd-cfind.cc
 test_cmd_cfind_CXXFLAGS=$(test_cxxflags)
 test_cmd_cfind_LDADD=${top_builddir}/lib/libtestmucommon.la $(CODE_COVERAGE_LIBS)
 
diff --git a/mu/meson.build b/mu/meson.build
index 352536a1..e7e36381 100644
--- a/mu/meson.build
+++ b/mu/meson.build
@@ -49,7 +49,7 @@ testmaildir=join_paths(meson.current_source_dir(),'../lib')
 
 test('test_cmd',
      executable('test-cmd',
-		'test-mu-cmd.cc',
+		'tests/test-mu-cmd.cc',
 		install: false,
 		cpp_args: ['-DMU_PROGRAM="' + mu_binary + '"',
 			   '-DMU_TESTMAILDIR2="'+ join_paths(testmaildir, 'testdir2') + '"',
@@ -57,7 +57,7 @@ test('test_cmd',
 		dependencies: [glib_dep, lib_test_mu_common_dep, config_h_dep, lib_mu_dep]))
 test('test_cmd_cfind',
      executable('test-cmd-cfind',
-		'test-mu-cmd-cfind.cc',
+		'tests/test-mu-cmd-cfind.cc',
 		install: false,
 		cpp_args: ['-DMU_PROGRAM="' + mu_binary + '"',
 			   '-DMU_TESTMAILDIR="'+ join_paths(testmaildir, 'testdir') + '"',
@@ -65,10 +65,17 @@ test('test_cmd_cfind',
 		dependencies: [glib_dep, lib_test_mu_common_dep, config_h_dep]))
 test('test_cmd_query',
      executable('test-cmd-query',
-		'test-mu-query.cc',
+		'tests/test-mu-query.cc',
 		install: false,
 		cpp_args: ['-DMU_PROGRAM="' + mu_binary + '"',
 			   '-DMU_TESTMAILDIR="'+ join_paths(testmaildir, 'testdir') + '"',
 			   '-DMU_TESTMAILDIR2="'+ join_paths(testmaildir, 'testdir2') + '"'
 			  ],
 		dependencies: [glib_dep, lib_test_mu_common_dep, config_h_dep, lib_mu_dep]))
+
+gmime_test = executable(
+  'gmime-test', [
+  'tests/gmime-test.c'
+],
+  dependencies: [ glib_dep, gmime_dep ],
+  install: false)
diff --git a/mu/test-mu-cmd-cfind.cc b/mu/tests/test-mu-cmd-cfind.cc
similarity index 100%
rename from mu/test-mu-cmd-cfind.cc
rename to mu/tests/test-mu-cmd-cfind.cc
diff --git a/mu/test-mu-cmd.cc b/mu/tests/test-mu-cmd.cc
similarity index 100%
rename from mu/test-mu-cmd.cc
rename to mu/tests/test-mu-cmd.cc
diff --git a/mu/test-mu-query.cc b/mu/tests/test-mu-query.cc
similarity index 100%
rename from mu/test-mu-query.cc
rename to mu/tests/test-mu-query.cc