X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2FMakefile.am;h=80d404e86442932c410b8e2e872699121111531a;hb=269c5eaed0f3333f014e04835a304bdfa9275e53;hp=c9a660248b547940d999d6cfc8801645104867f7;hpb=8fde91038538d01aaa5b36ebb06b516a8c313364;p=meshlink

diff --git a/test/Makefile.am b/test/Makefile.am
index c9a66024..80d404e8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,29 +1,48 @@
 TESTS = \
 	basic.test \
 	basicpp.test \
-	trio.test \
 	channels.test \
+	channels-failure.test \
 	channels-fork.test \
 	channels-cornercases.test \
+	duplicate.test \
+	encrypted.test \
+	ephemeral.test \
 	import-export.test \
 	invite-join.test \
-	sign-verify.test
+	sign-verify.test \
+	trio.test \
+	trio2.test
+
+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 \
-	trio \
 	channels \
+	channels-failure \
 	channels-fork \
 	channels-cornercases \
+	duplicate \
+	echo-fork \
+	encrypted \
+	ephemeral \
 	import-export \
 	invite-join \
 	sign-verify \
-	echo-fork
+	trio \
+	trio2
+
+if INSTALL_TESTS
+bin_PROGRAMS = $(check_PROGRAMS)
+endif
 
 basic_SOURCES = basic.c
 basic_LDADD = ../src/libmeshlink.la
@@ -31,21 +50,30 @@ basic_LDADD = ../src/libmeshlink.la
 basicpp_SOURCES = basicpp.cpp
 basicpp_LDADD = ../src/libmeshlink.la
 
-trio_SOURCES = trio.c
-trio_LDADD = ../src/libmeshlink.la
-
-channels_SOURCES = channels.cpp
+channels_SOURCES = channels.c
 channels_LDADD = ../src/libmeshlink.la
 
-channels_fork_SOURCES = channels-fork.cpp
+channels_failure_SOURCES = channels-failure.c utils.c utils.h
+channels_failure_LDADD = ../src/libmeshlink.la
+
+channels_fork_SOURCES = channels-fork.c
 channels_fork_LDADD = ../src/libmeshlink.la
 
-channels_cornercases_SOURCES = channels-cornercases.cpp utils.cpp utils.h
+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
 
+encrypted_SOURCES = encrypted.c
+encrypted_LDADD = ../src/libmeshlink.la
+
+ephemeral_SOURCES = ephemeral.c
+ephemeral_LDADD = ../src/libmeshlink.la
+
 import_export_SOURCES = import-export.c
 import_export_LDADD = ../src/libmeshlink.la
 
@@ -55,5 +83,8 @@ 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
+
+trio2_SOURCES = trio2.c
+trio2_LDADD = ../src/libmeshlink.la