X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2FMakefile.am;h=c4e6466f48c14a74ff3c339d3bc425ce7c8b2cc0;hb=9a2520c36431a8a5fd90451e97f488c22f4decc5;hp=630f5d7d91823d177f45192b1b190f496dee4cb2;hpb=53eb21510cf90c47f11d81a5b45a5f4d34d738f1;p=meshlink

diff --git a/test/Makefile.am b/test/Makefile.am
index 630f5d7d..c4e6466f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,41 +1,110 @@
 TESTS = \
-	basic.test \
-	basicpp.test \
-	channels.test \
-	channels-fork.test \
-	import-export.test \
-	invite-join.test \
-	sign-verify.test
+	basic \
+	basicpp \
+	channels \
+	channels-aio \
+	channels-aio-fd \
+	channels-cornercases \
+	channels-failure \
+	channels-fork \
+	channels-no-partial \
+	channels-udp \
+	duplicate \
+	encrypted \
+	ephemeral \
+	import-export \
+	invite-join \
+	sign-verify \
+	trio \
+	trio2
+
+if BLACKBOX_TESTS
+SUBDIRS = blackbox
+endif
 
 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-aio \
+	channels-aio-fd \
+	channels-cornercases \
+	channels-failure \
+	channels-fork \
+	channels-no-partial \
+	channels-udp \
+	duplicate \
+	echo-fork \
+	encrypted \
+	ephemeral \
+	import-export \
+	invite-join \
+	sign-verify \
+	trio \
+	trio2
 
-check_PROGRAMS = basic basicpp channels channels-fork import-export invite-join sign-verify echo-fork
+if INSTALL_TESTS
+bin_PROGRAMS = $(check_PROGRAMS)
+endif
 
-basic_SOURCES = basic.c
+basic_SOURCES = basic.c utils.c utils.h
 basic_LDADD = ../src/libmeshlink.la
 
-basicpp_SOURCES = basicpp.cpp
+basicpp_SOURCES = basicpp.cpp utils.c utils.h
 basicpp_LDADD = ../src/libmeshlink.la
 
-channels_SOURCES = channels.cpp
+channels_SOURCES = channels.c utils.c utils.h
 channels_LDADD = ../src/libmeshlink.la
 
-channels_fork_SOURCES = channels-fork.cpp
+channels_aio_SOURCES = channels-aio.c utils.c utils.h
+channels_aio_LDADD = ../src/libmeshlink.la
+
+channels_aio_fd_SOURCES = channels-aio-fd.c utils.c utils.h
+channels_aio_fd_LDADD = ../src/libmeshlink.la
+
+channels_no_partial_SOURCES = channels-no-partial.c utils.c utils.h
+channels_no_partial_LDADD = ../src/libmeshlink.la
+
+channels_failure_SOURCES = channels-failure.c utils.c utils.h
+channels_failure_LDADD = ../src/libmeshlink.la
+
+channels_fork_SOURCES = channels-fork.c utils.c utils.h
 channels_fork_LDADD = ../src/libmeshlink.la
 
-echo_fork_SOURCES = echo-fork.c
+channels_cornercases_SOURCES = channels-cornercases.c utils.c utils.h
+channels_cornercases_LDADD = ../src/libmeshlink.la
+
+channels_udp_SOURCES = channels-udp.c utils.c utils.h
+channels_udp_LDADD = ../src/libmeshlink.la
+
+duplicate_SOURCES = duplicate.c utils.c utils.h
+duplicate_LDADD = ../src/libmeshlink.la
+
+echo_fork_SOURCES = echo-fork.c utils.c utils.h
 echo_fork_LDADD = ../src/libmeshlink.la
 
-import_export_SOURCES = import-export.c
+encrypted_SOURCES = encrypted.c utils.c utils.h
+encrypted_LDADD = ../src/libmeshlink.la
+
+ephemeral_SOURCES = ephemeral.c utils.c utils.h
+ephemeral_LDADD = ../src/libmeshlink.la
+
+import_export_SOURCES = import-export.c utils.c utils.h
 import_export_LDADD = ../src/libmeshlink.la
 
-invite_join_SOURCES = invite-join.c
+invite_join_SOURCES = invite-join.c utils.c utils.h
 invite_join_LDADD = ../src/libmeshlink.la
 
-sign_verify_SOURCES = sign-verify.c
+sign_verify_SOURCES = sign-verify.c utils.c utils.h
 sign_verify_LDADD = ../src/libmeshlink.la
 
-channels_SOURCES = channels.c
-channels_LDADD = ../src/libmeshlink.la
+trio_SOURCES = trio.c utils.c utils.h
+trio_LDADD = ../src/libmeshlink.la
+
+trio2_SOURCES = trio2.c utils.c utils.h
+trio2_LDADD = ../src/libmeshlink.la