X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2FMakefile.am;h=f364215bcf9472cd7718d8ee622bc2947e6e273f;hb=516bfe0557afe6adaa3ea73494b5fe1cf5587b64;hp=3828584c584430d64ff6a9a6cf7488e2dcf44233;hpb=4c9d02d9b204f3300c28331b00baa32b2690a930;p=meshlink

diff --git a/test/Makefile.am b/test/Makefile.am
index 3828584c..f364215b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,17 +1,34 @@
 TESTS = \
 	basic.test \
 	basicpp.test \
+	trio.test \
 	channels.test \
 	channels-fork.test \
+	channels-cornercases.test \
 	import-export.test \
 	invite-join.test \
 	sign-verify.test
 
 dist_check_SCRIPTS = $(TESTS)
 
-AM_CPPFLAGS = -I../src
-
-check_PROGRAMS = basic basicpp channels channels-fork import-export invite-join sign-verify
+AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -Wall
+AM_LDFLAGS = $(PTHREAD_LIBS)
+
+check_PROGRAMS = \
+	basic \
+	basicpp \
+	trio \
+	channels \
+	channels-fork \
+	channels-cornercases \
+	import-export \
+	invite-join \
+	sign-verify \
+	echo-fork
+
+if INSTALL_TESTS
+bin_PROGRAMS = $(check_PROGRAMS)
+endif
 
 basic_SOURCES = basic.c
 basic_LDADD = ../src/libmeshlink.la
@@ -19,12 +36,21 @@ basic_LDADD = ../src/libmeshlink.la
 basicpp_SOURCES = basicpp.cpp
 basicpp_LDADD = ../src/libmeshlink.la
 
-channels_SOURCES = channels.cpp
+trio_SOURCES = trio.c
+trio_LDADD = ../src/libmeshlink.la
+
+channels_SOURCES = channels.c
 channels_LDADD = ../src/libmeshlink.la
 
-channels_fork_SOURCES = channels-fork.cpp
+channels_fork_SOURCES = channels-fork.c
 channels_fork_LDADD = ../src/libmeshlink.la
 
+channels_cornercases_SOURCES = channels-cornercases.c utils.c utils.h
+channels_cornercases_LDADD = ../src/libmeshlink.la
+
+echo_fork_SOURCES = echo-fork.c
+echo_fork_LDADD = ../src/libmeshlink.la
+
 import_export_SOURCES = import-export.c
 import_export_LDADD = ../src/libmeshlink.la
 
@@ -33,6 +59,3 @@ invite_join_LDADD = ../src/libmeshlink.la
 
 sign_verify_SOURCES = sign-verify.c
 sign_verify_LDADD = ../src/libmeshlink.la
-
-channels_SOURCES = channels.c
-channels_LDADD = ../src/libmeshlink.la