Update UTCP to correctly handle timeouts sending data.

[meshlink] / test / Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index 7a09576ef2312ae71d399ec2c54a1c26c4c986ee..80d404e86442932c410b8e2e872699121111531a 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,15 +1,90 @@
 TESTS = \
        basic.test \
-       commandline.test \
-       executables.test \
+       basicpp.test \
+       channels.test \
+       channels-failure.test \
+       channels-fork.test \
+       channels-cornercases.test \
+       duplicate.test \
+       encrypted.test \
+       ephemeral.test \
        import-export.test \
        invite-join.test \
-       sptps-basic.test \
-       variables.test
+       sign-verify.test \
+       trio.test \
+       trio2.test
 
-EXTRA_DIST = testlib.sh
+if BLACKBOX_TESTS
+SUBDIRS = blackbox
+endif
 
-clean-local:
-       -for pid in *.test.?/pid; do ../src/tinc --pidfile="$$pid" stop; done
-       -killall ../src/sptps_test
-       -rm -rf *.test.?
+dist_check_SCRIPTS = $(TESTS)
+
+AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -Wall
+AM_LDFLAGS = $(PTHREAD_LIBS)
+
+check_PROGRAMS = \
+       basic \
+       basicpp \
+       channels \
+       channels-failure \
+       channels-fork \
+       channels-cornercases \
+       duplicate \
+       echo-fork \
+       encrypted \
+       ephemeral \
+       import-export \
+       invite-join \
+       sign-verify \
+       trio \
+       trio2
+
+if INSTALL_TESTS
+bin_PROGRAMS = $(check_PROGRAMS)
+endif
+
+basic_SOURCES = basic.c
+basic_LDADD = ../src/libmeshlink.la
+
+basicpp_SOURCES = basicpp.cpp
+basicpp_LDADD = ../src/libmeshlink.la
+
+channels_SOURCES = channels.c
+channels_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
+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
+
+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
+
+invite_join_SOURCES = invite-join.c
+invite_join_LDADD = ../src/libmeshlink.la
+
+sign_verify_SOURCES = sign-verify.c
+sign_verify_LDADD = ../src/libmeshlink.la
+
+trio_SOURCES = trio.c
+trio_LDADD = ../src/libmeshlink.la
+
+trio2_SOURCES = trio2.c
+trio2_LDADD = ../src/libmeshlink.la