From e9e38116577ec50413a280636e561fdc52148f99 Mon Sep 17 00:00:00 2001
From: thorkill <thkr@hannover.ccc.de>
Date: Fri, 26 Jun 2015 17:17:39 +0200
Subject: [PATCH] Added tests into automake files.

---
 Makefile.am      | 14 ++++++++++++--
 configure.ac     |  2 ++
 test/Makefile.am | 15 ++++++++++++++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 75eea49e..68689c0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  src doc gui test
+SUBDIRS = test src doc gui
 
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = COPYING.README README.android
 
@@ -33,3 +33,13 @@ release:
 	echo "Please edit the NEWS file now..."
 	/usr/bin/editor $(srcdir)/NEWS
 	$(MAKE) dist
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+	{                                      \
+	echo '# Signature of the current package.'; \
+	echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+	echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+	echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+	echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+	echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	} >$(srcdir)/package.m4
diff --git a/configure.ac b/configure.ac
index 9e19ab96..1aea5f7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,4 +255,6 @@ AC_ARG_ENABLE(jumbograms,
 
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile gui/Makefile test/Makefile])
 
+AC_CONFIG_TESTDIR(test/, [test-path = 'test/'])
+
 AC_OUTPUT
diff --git a/test/Makefile.am b/test/Makefile.am
index 5457b2fc..95462861 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,6 @@
+
 TESTS = \
+	simple \
 	basic.test \
 	commandline.test \
 	executables.test \
@@ -9,14 +11,25 @@ TESTS = \
 	sptps-basic.test \
 	variables.test
 
+CC=afl-clang
+
 dist_check_SCRIPTS = $(TESTS)
 
 EXTRA_DIST = testlib.sh
 
-check_PROGRAMS = pong
+check_PROGRAMS = pong simple
 
 pong_SOURCES = pong.c
 
+simple_SOURCES = \
+	simple.c
+
+pong_LDFLAGS = -L$(top_srcdir)/src -ltinc
+
+simple_CFLAGS =  -I$(top_srcdir)/src -I/usr/include -iquote$(top_srcdir)/src
+simple_LDFLAGS = -L$(top_srcdir)/src -lcmocka -ltincd -lchacha_poly1305 -led25519
+
+
 clean-local:
 	-for pid in *.test.?/pid; do ../src/tinc --pidfile="$$pid" stop; done
 	-killall ../src/sptps_test