meson: make it possible to build tests.

3 files changed, 13 insertions, 75 deletions

diff --git a/meson.build b/meson.build
index db5ad6c..50073cf 100644
--- a/meson.build
+++ b/meson.build
@@ -16,18 +16,20 @@ subdir('include')
 subdir('src')
 
 if ((not get_option('static')) and (not get_option('shared')))
-	library('rin', sources, version : '0.0.0', include_directories : inc, install : true, dependencies : deps)
+	librin = library('rin', sources, version : '0.0.0', include_directories : inc, install : true, dependencies : deps)
 endif
 
 if get_option('static')
-	static_library('rin', sources, version : '0.0.0', include_directories : inc, install : true, dependencies : deps)
+	librin = static_library('rin', sources, version : '0.0.0', include_directories : inc, install : true, dependencies : deps)
 endif
 
 if get_option('shared')
-	shared_library('rin', sources, version : '0.0.0', include_directories : inc, install : true, dependencies : deps)
+	librin = shared_library('rin', sources, version : '0.0.0', include_directories : inc, install : true, dependencies : deps)
 endif
 
 
 if get_option('tests')
 	subdir('test')
+	test_e = executable('test executable', test_sources, include_directories : inc, link_with : librin)
+	test('librin test', test_e)
 endif
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 65e6c2c..0000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (C) 2015 Gediminas Jakutis
-#
-# This Makefile.am is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; version 2.1
-# of the License.
-#
-# 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include/ \
-	-Wall \
-	-Wextra
-
-check_PROGRAMS = test
-check_LTLIBRARIES = \
-	libtest.la \
-	libfloat_test.la \
-	libdiagnostic_test.la
-
-# test program
-test_LDADD = \
-	libtest.la \
-	libfloat_test.la \
-	libdiagnostic_test.la
-
-test_SOURCES = \
-	main.c \
-	test.h \
-	float_test.h \
-	diagnostic_test.h
-
-# test lib
-libtest_la_SOURCES = \
-	test.c \
-	test.h
-
-# float module test
-libfloat_test_la_SOURCES = \
-	float.c \
-	float_test.h \
-	float_test_private.h \
-	test.h
-
-libfloat_test_la_LIBADD = \
-	libtest.la \
-	$(top_srcdir)/src/librin.la
-
-# diagnostic module test
-libdiagnostic_test_la_SOURCES = \
-	diagnostic.c \
-	diagnostic_test.h \
-	diagnostic_test_private.h \
-	test.h
-
-libdiagnostic_test_la_LIBADD = \
-	libtest.la \
-	$(top_srcdir)/src/librin.la
-
-noinst_HEADERS = \
-	test.h \
-	float_test.h \
-	float_test_private.h \
-	diagnostic_test.h \
-	diagnostic_test_private.h
diff --git a/test/meson.build b/test/meson.build
new file mode 100644
index 0000000..70dfcf9
--- /dev/null
+++ b/test/meson.build
@@ -0,0 +1,8 @@
+test_filenames = [
+	'main.c',
+	'test.c',
+	'float.c',
+	'diagnostic.c',
+	]
+
+test_sources = files(test_filenames)