X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2FMakefile.am;h=f364215bcf9472cd7718d8ee622bc2947e6e273f;hb=2bd4182c4d960596b54793027a0f42e991eb12dd;hp=5457b2fcd6b919a253ee71ce1e0d620f8614e98c;hpb=fa1e9b046128db81c207c9ed920d068a144cd687;p=meshlink

diff --git a/test/Makefile.am b/test/Makefile.am
index 5457b2fc..f364215b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,24 +1,61 @@
 TESTS = \
 	basic.test \
-	commandline.test \
-	executables.test \
+	basicpp.test \
+	trio.test \
+	channels.test \
+	channels-fork.test \
+	channels-cornercases.test \
 	import-export.test \
 	invite-join.test \
-	ns-ping.test \
-	ping.test \
-	sptps-basic.test \
-	variables.test
+	sign-verify.test
 
 dist_check_SCRIPTS = $(TESTS)
 
-EXTRA_DIST = testlib.sh
+AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -Wall
+AM_LDFLAGS = $(PTHREAD_LIBS)
 
-check_PROGRAMS = pong
+check_PROGRAMS = \
+	basic \
+	basicpp \
+	trio \
+	channels \
+	channels-fork \
+	channels-cornercases \
+	import-export \
+	invite-join \
+	sign-verify \
+	echo-fork
 
-pong_SOURCES = pong.c
+if INSTALL_TESTS
+bin_PROGRAMS = $(check_PROGRAMS)
+endif
 
-clean-local:
-	-for pid in *.test.?/pid; do ../src/tinc --pidfile="$$pid" stop; done
-	-killall ../src/sptps_test
-	-killall pong
-	-rm -rf *.test.?
+basic_SOURCES = basic.c
+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.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
+
+echo_fork_SOURCES = echo-fork.c
+echo_fork_LDADD = ../src/libmeshlink.la
+
+import_export_SOURCES = import-export.c
+import_export_LDADD = ../src/libmeshlink.la
+
+invite_join_SOURCES = invite-join.c
+invite_join_LDADD = ../src/libmeshlink.la
+
+sign_verify_SOURCES = sign-verify.c
+sign_verify_LDADD = ../src/libmeshlink.la