tests: move to subdir, move to meson

De-clutter the source directories a bit. Ensure tests build with meson, and
remove from autotools in a few places (no need to do things twice).

lib/utils/Makefile.am

@@ -79,52 +79,4 @@ libmu_utils_la_LIBADD=						\
 	$(READLINE_LIBS)					\
 	$(CODE_COVERAGE_LIBS)
 
-noinst_PROGRAMS=						\
-	$(TEST_PROGS)
-
-TEST_PROGS+=							\
-	test-mu-util
-test_mu_util_SOURCES=						\
-	test-mu-util.c
-test_mu_util_LDADD=						\
-	libmu-utils.la
-
-TEST_PROGS+=							\
-	test-mu-utils
-test_mu_utils_SOURCES=						\
-	test-utils.cc
-test_mu_utils_LDADD=						\
-	libmu-utils.la
-
-TEST_PROGS+=							\
-	test-mu-str
-test_mu_str_SOURCES=						\
-	test-mu-str.c
-test_mu_str_LDADD=						\
-	libmu-utils.la
-
-TEST_PROGS+=							\
-	test-sexp
-test_sexp_SOURCES=						\
-	test-sexp.cc
-test_sexp_LDADD=						\
-	libmu-utils.la
-
-TEST_PROGS+=							\
-	test-command-parser
-test_command_parser_SOURCES=					\
-	test-command-parser.cc
-test_command_parser_LDADD=					\
-	libmu-utils.la
-
-TEST_PROGS+=							\
-	test-option
-test_option_SOURCES=						\
-	test-option.cc
-test_option_LDADD=						\
-	libmu-utils.la
-
-
-TESTS=$(TEST_PROGS)
-
 include $(top_srcdir)/aminclude_static.am

lib/utils/meson.build

@@ -53,41 +53,4 @@ lib_mu_utils_dep = declare_dependency(
   include_directories: include_directories(['.', '..'])
 )
 
-
-################################################################################
-# tests
-#
-testmaildir=join_paths(meson.current_source_dir(),'..')
-
-test('test_command_parser',
-     executable('test-command-parser',
-		'test-command-parser.cc',
-		install: false,
-		dependencies: [glib_dep, lib_mu_utils_dep]))
-test('test_mu_str',
-     executable('test-mu-str',
-		'test-mu-str.c',
-		install: false,
-		dependencies: [glib_dep, config_h_dep,lib_mu_utils_dep]))
-test('test_mu_util',
-     executable('test-mu-util',
-		'test-mu-util.c',
-		install: false,
-		dependencies: [glib_dep,config_h_dep, lib_mu_utils_dep],
-		c_args: ['-DMU_TESTMAILDIR="' + join_paths(testmaildir, 'testdir') + '"',
-			 '-DMU_TESTMAILDIR2="' + join_paths(testmaildir, 'testdir2') + '"']))
-test('test_option',
-     executable('test-option',
-		'test-option.cc',
-		install: false,
-		dependencies: [glib_dep, lib_mu_utils_dep]))
-test('test_mu_utils',
-     executable('test-mu-utils',
-		'test-utils.cc',
-		install: false,
-		dependencies: [glib_dep, lib_mu_utils_dep]))
-test('test_sexp',
-     executable('test-sexp',
-		'test-sexp.cc',
-		install: false,
-		dependencies: [glib_dep, lib_mu_utils_dep] ))
+subdir('tests')

lib/utils/tests/meson.build

@@ -0,0 +1,50 @@
+## Copyright (C) 2021 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software Foundation,
+## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+################################################################################
+# tests
+#
+test('test_command_parser',
+     executable('test-command-parser',
+		'test-command-parser.cc',
+		install: false,
+		dependencies: [glib_dep, lib_mu_utils_dep]))
+test('test_mu_str',
+     executable('test-mu-str',
+		'test-mu-str.c',
+		install: false,
+		dependencies: [glib_dep, config_h_dep,lib_mu_utils_dep]))
+test('test_mu_util',
+     executable('test-mu-util',
+		'test-mu-util.c',
+		install: false,
+		dependencies: [glib_dep,config_h_dep, lib_mu_utils_dep]))
+test('test_option',
+     executable('test-option',
+		'test-option.cc',
+		install: false,
+		dependencies: [glib_dep, lib_mu_utils_dep]))
+test('test_mu_utils',
+     executable('test-mu-utils',
+		'test-utils.cc',
+		install: false,
+		dependencies: [glib_dep, lib_mu_utils_dep]))
+test('test_sexp',
+     executable('test-sexp',
+		'test-sexp.cc',
+		install: false,
+		dependencies: [glib_dep, lib_mu_utils_dep] ))