X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=test%2FMakefile.am;h=77fd5ef1828734e739aaa2d66b0b8504dd7f4f99;hb=dc68da94af8fca91748579c84ef5ed798db7efab;hp=a95d22eceef18cd370b2bfa7abd04e98cdcb2556;hpb=4529e8c8db68bc40ff80947139366514787d5130;p=meshlink

diff --git a/test/Makefile.am b/test/Makefile.am
index a95d22ec..77fd5ef1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,15 +1,38 @@
 TESTS = \
 	basic.test \
 	basicpp.test \
+	channels.test \
+	channels-fork.test \
+	channels-cornercases.test \
+	duplicate.test \
 	import-export.test \
 	invite-join.test \
-	sign-verify.test
+	sign-verify.test \
+	trio.test
+
+SUBDIRS = blackbox
 
 dist_check_SCRIPTS = $(TESTS)
 
-AM_CPPFLAGS = -I../src
+AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -Wall
+AM_LDFLAGS = $(PTHREAD_LIBS)
+
+check_PROGRAMS = \
+	basic \
+	basicpp \
+	channels \
+	channels-fork \
+	channels-cornercases \
+	duplicate \
+	echo-fork \
+	import-export \
+	invite-join \
+	sign-verify \
+	trio
 
-check_PROGRAMS = basic basicpp import-export invite-join sign-verify
+if INSTALL_TESTS
+bin_PROGRAMS = $(check_PROGRAMS)
+endif
 
 basic_SOURCES = basic.c
 basic_LDADD = ../src/libmeshlink.la
@@ -17,6 +40,21 @@ basic_LDADD = ../src/libmeshlink.la
 basicpp_SOURCES = basicpp.cpp
 basicpp_LDADD = ../src/libmeshlink.la
 
+channels_SOURCES = channels.c
+channels_LDADD = ../src/libmeshlink.la
+
+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
+
+duplicate_SOURCES = duplicate.c
+duplicate_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
 
@@ -26,5 +64,5 @@ 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
+trio_SOURCES = trio.c
+trio_LDADD = ../src/libmeshlink.la