diff options
| author | vimene <vincent.menegaux@gmail.com> | 2023-12-03 08:17:56 +0100 |
|---|---|---|
| committer | vimene <vincent.menegaux@gmail.com> | 2023-12-03 08:17:56 +0100 |
| commit | 7b82aa798a95d93e9c4361dfed12d2a5313e01cb (patch) | |
| tree | c2399d175c89f20a4c8d29b422fb508e59f62352 | |
| parent | 22431a1305d1eb9f1c066f94313e04021a3a59a0 (diff) | |
| download | engine-7b82aa798a95d93e9c4361dfed12d2a5313e01cb.tar.gz | |
improved tests management
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | Makefile.am | 21 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/test.c | 5 |
5 files changed, 14 insertions, 26 deletions
@@ -2,8 +2,8 @@ /engine /engine.exe -# tests binaries -/engine-tests +# tests +/tests/test-suite.log # autotools files .deps/ @@ -23,9 +23,6 @@ Makefile.in /autom4te.cache/ /config.log /config.status -/engine-tests.log -/engine-tests.trs -/test-suite.log # vim .*.swp diff --git a/Makefile.am b/Makefile.am index 5926526..87033a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,12 @@ -ACLOCAL_AMFLAGS = -Im4 --install - +EXTRA_DIST = m4/NOTES +SUBDIRS = if ENABLE_TESTS -TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh -AM_TESTS_ENVIRONMENT = CRITERION_OUTPUTS='tap:-'; export CRITERION_OUTPUTS; + SUBDIRS += tests endif +ACLOCAL_AMFLAGS = -Im4 --install bin_PROGRAMS = engine + engine_SOURCES = src/engine.cpp \ src/fb/chfb.h src/fb/chfb.cpp src/fb/pixfb.h src/fb/pixfb.cpp \ src/math/math_vector.h src/math/math_vector.cpp \ @@ -19,15 +20,3 @@ engine_SOURCES = src/engine.cpp \ engine_CPPFLAGS = -Wall -Wextra $(DEPS_CPPFLAGS) engine_LDFLAGS = -Wall -Wextra engine_LDADD = $(DEPS_LIBS) - -if ENABLE_TESTS -check_PROGRAMS = engine-tests -engine_tests_SOURCES = tests/test.c -engine_tests_CPPFLAGS = -Wall -Wextra $(TESTS_DEPS_CPPFLAGS) -engine_tests_LDFLAGS = -Wall -Wextra -engine_tests_LDADD = $(TESTS_DEPS_LIBS) - -TESTS = engine-tests -endif - -EXTRA_DIST = m4/NOTES diff --git a/configure.ac b/configure.ac index 78e1976..fe47a8e 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ PKG_CHECK_MODULES([CRITERION], [criterion >= 2.4.1], [ enable_tests=yes TESTS_DEPS_CPPFLAGS="$CRITERION_CFLAGS $TESTS_DEPS_CPPFLAGS" TESTS_DEPS_LIBS="$CRITERION_LIBS $TESTS_DEPS_LIBS" + AC_CONFIG_FILES([tests/Makefile]) ], [enable_tests=no]) AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes]) diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..090b103 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,6 @@ +TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh +AM_TESTS_ENVIRONMENT = CRITERION_OUTPUTS='tap:-'; export CRITERION_OUTPUTS; + +check_PROGRAMS = + +TESTS = diff --git a/tests/test.c b/tests/test.c deleted file mode 100644 index a16c63a..0000000 --- a/tests/test.c +++ /dev/null @@ -1,5 +0,0 @@ -#include <criterion/criterion.h> - -Test(simple, test) { - cr_assert(0, "Hello, World!"); -} |