From 3a4987da18b165d5a5297ddaf64f1336958bb3c7 Mon Sep 17 00:00:00 2001 From: hugbubby Date: Sat, 28 Jul 2018 16:54:44 -0700 Subject: [PATCH] Fix autotools build Mosts of the tests in auto_tests weren't running when the project was built using autotools. This fixes that. --- auto_tests/Makefile.inc | 235 +++++++++++++++++++++++++++------------- 1 file changed, 160 insertions(+), 75 deletions(-) diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc index 67c72016..34388c51 100644 --- a/auto_tests/Makefile.inc +++ b/auto_tests/Makefile.inc @@ -1,7 +1,19 @@ if BUILD_TESTS -TESTS = encryptsave_test messenger_autotest crypto_test network_test onion_test TCP_test dht_autotest tox_strncasecmp_test -check_PROGRAMS = encryptsave_test messenger_autotest crypto_test network_test onion_test TCP_test dht_autotest tox_strncasecmp_test +TESTS = bootstrap_test conference_double_invite_test conference_peer_nick_test conference_simple_test conference_test \ + conference_two_test crypto_test dht_test encryptsave_test file_saving_test file_transfer_test friend_connection_test \ + friend_request_test invalid_tcp_proxy_test invalid_udp_proxy_test lan_discovery_test lossless_packet_test \ + lossy_packet_test messenger_test network_test onion_test overflow_recvq_test overflow_sendq_test save_friend_test \ + save_load_test send_message_test set_name_test set_status_message_test skeleton_test tcp_relay_test TCP_test \ + tox_many_tcp_test tox_many_test tox_one_test tox_strncasecmp_test typing_test version_test + +check_PROGRAMS = bootstrap_test conference_double_invite_test conference_peer_nick_test conference_simple_test \ + conference_test conference_two_test crypto_test dht_test encryptsave_test file_saving_test file_transfer_test \ + friend_connection_test friend_request_test invalid_tcp_proxy_test invalid_udp_proxy_test lan_discovery_test \ + lossless_packet_test lossy_packet_test messenger_test network_test onion_test overflow_recvq_test \ + overflow_sendq_test save_friend_test save_load_test send_message_test set_name_test set_status_message_test \ + skeleton_test tcp_relay_test TCP_test tox_many_tcp_test tox_many_test tox_one_test tox_strncasecmp_test \ + typing_test version_test AUTOTEST_CFLAGS = \ $(LIBSODIUM_CFLAGS) \ @@ -25,94 +37,167 @@ check_PROGRAMS += toxav_basic_test toxav_many_test AUTOTEST_LDADD += libtoxav.la endif -messenger_autotest_SOURCES = ../auto_tests/messenger_test.c +bootstrap_test_SOURCES = ../auto_tests/bootstrap_test.c +bootstrap_test_CFLAGS = $(AUTO_TEST_CFLAGS) +bootstrap_test_LDADD = $(AUTOTEST_LDADD) -messenger_autotest_CFLAGS = $(AUTOTEST_CFLAGS) +conference_double_invite_test_SOURCES = ../auto_tests/bootstrap_test.c +conference_double_invite_test_CFLAGS = $(AUTO_TEST_CFLAGS) +conference_double_invite_test_LDADD = $(AUTOTEST_LDADD) -messenger_autotest_LDADD = $(AUTOTEST_LDADD) +conference_peer_nick_test_SOURCES = ../auto_tests/bootstrap_test.c +conference_peer_nick_test_CFLAGS = $(AUTO_TEST_CFLAGS) +conference_peer_nick_test_LDADD = $(AUTOTEST_LDADD) +conference_simple_test_SOURCES = ../auto_tests/bootstrap_test.c +conference_simple_test_CFLAGS = $(AUTO_TEST_CFLAGS) +conference_simple_test_LDADD = $(AUTOTEST_LDADD) -crypto_test_SOURCES = ../auto_tests/crypto_test.c +conference_test_SOURCES = ../auto_tests/bootstrap_test.c +conference_test_CFLAGS = $(AUTO_TEST_CFLAGS) +conference_test_LDADD = $(AUTOTEST_LDADD) -crypto_test_CFLAGS = $(AUTOTEST_CFLAGS) +conference_two_test_SOURCES = ../auto_tests/bootstrap_test.c +conference_two_test_CFLAGS = $(AUTO_TEST_CFLAGS) +conference_two_test_LDADD = $(AUTOTEST_LDADD) +crypto_test_SOURCES = ../auto_tests/bootstrap_test.c +crypto_test_CFLAGS = $(AUTO_TEST_CFLAGS) crypto_test_LDADD = $(AUTOTEST_LDADD) +dht_test_SOURCES = ../auto_tests/bootstrap_test.c +dht_test_CFLAGS = $(AUTO_TEST_CFLAGS) +dht_test_LDADD = $(AUTOTEST_LDADD) -network_test_SOURCES = ../auto_tests/network_test.c - -network_test_CFLAGS = $(AUTOTEST_CFLAGS) - -network_test_LDADD = $(AUTOTEST_LDADD) - - -onion_test_SOURCES = ../auto_tests/onion_test.c - -onion_test_CFLAGS = $(AUTOTEST_CFLAGS) - -onion_test_LDADD = $(AUTOTEST_LDADD) - - -TCP_test_SOURCES = ../auto_tests/TCP_test.c - -TCP_test_CFLAGS = $(AUTOTEST_CFLAGS) - -TCP_test_LDADD = $(AUTOTEST_LDADD) - - -dht_autotest_SOURCES = ../auto_tests/dht_test.c - -dht_autotest_CFLAGS = $(AUTOTEST_CFLAGS) - -dht_autotest_LDADD = $(AUTOTEST_LDADD) - - -# TODO(iphydf): These tests are broken. The code needs to be fixed, as the -# tests themselves are correct. -#selfname_change_conference_SOURCE = ../auto_tests/selfname_change_conference_test.c -# -#selfname_change_conference_CFLAGS = $(AUTOTEST_CFLAGS) -# -#selfname_change_conference_LDADD = $(AUTOTEST_LDADD) -# -# -#self_conference_title_change_SOURCE = ../auto_tests/self_conference_title_change_test.c -# -#self_conference_title_change_CFLAGS = $(AUTOTEST_CFLAGS) -# -#self_conference_title_change_LDADD = $(AUTOTEST_LDADD) - - -if BUILD_AV -toxav_basic_test_SOURCES = ../auto_tests/toxav_basic_test.c - -toxav_basic_test_CFLAGS = $(AUTOTEST_CFLAGS) - -toxav_basic_test_LDADD = $(AUTOTEST_LDADD) $(AV_LIBS) - - -toxav_many_test_SOURCES = ../auto_tests/toxav_many_test.c - -toxav_many_test_CFLAGS = $(AUTOTEST_CFLAGS) - -toxav_many_test_LDADD = $(AUTOTEST_LDADD) -endif - -endif - - -encryptsave_test_SOURCES = ../auto_tests/encryptsave_test.c - -encryptsave_test_CFLAGS = $(AUTOTEST_CFLAGS) - +encryptsave_test_SOURCES = ../auto_tests/bootstrap_test.c +encryptsave_test_CFLAGS = $(AUTO_TEST_CFLAGS) encryptsave_test_LDADD = $(AUTOTEST_LDADD) +file_saving_test_SOURCES = ../auto_tests/bootstrap_test.c +file_saving_test_CFLAGS = $(AUTO_TEST_CFLAGS) +file_saving_test_LDADD = $(AUTOTEST_LDADD) -tox_strncasecmp_test_SOURCES = ../auto_tests/tox_strncasecmp_test.c +file_transfer_test_SOURCES = ../auto_tests/bootstrap_test.c +file_transfer_test_CFLAGS = $(AUTO_TEST_CFLAGS) +file_transfer_test_LDADD = $(AUTOTEST_LDADD) -tox_strncasecmp_test_CFLAGS = $(AUTOTEST_CFLAGS) +friend_connection_test_SOURCES = ../auto_tests/bootstrap_test.c +friend_connection_test_CFLAGS = $(AUTO_TEST_CFLAGS) +friend_connection_test_LDADD = $(AUTOTEST_LDADD) +friend_request_test_SOURCES = ../auto_tests/bootstrap_test.c +friend_request_test_CFLAGS = $(AUTO_TEST_CFLAGS) +friend_request_test_LDADD = $(AUTOTEST_LDADD) + +invalid_tcp_proxy_test_SOURCES = ../auto_tests/bootstrap_test.c +invalid_tcp_proxy_test_CFLAGS = $(AUTO_TEST_CFLAGS) +invalid_tcp_proxy_test_LDADD = $(AUTOTEST_LDADD) + +invalid_udp_proxy_test_SOURCES = ../auto_tests/bootstrap_test.c +invalid_udp_proxy_test_CFLAGS = $(AUTO_TEST_CFLAGS) +invalid_udp_proxy_test_LDADD = $(AUTOTEST_LDADD) + +lan_discovery_test_SOURCES = ../auto_tests/bootstrap_test.c +lan_discovery_test_CFLAGS = $(AUTO_TEST_CFLAGS) +lan_discovery_test_LDADD = $(AUTOTEST_LDADD) + +lossless_packet_test_SOURCES = ../auto_tests/bootstrap_test.c +lossless_packet_test_CFLAGS = $(AUTO_TEST_CFLAGS) +lossless_packet_test_LDADD = $(AUTOTEST_LDADD) + +lossy_packet_test_SOURCES = ../auto_tests/bootstrap_test.c +lossy_packet_test_CFLAGS = $(AUTO_TEST_CFLAGS) +lossy_packet_test_LDADD = $(AUTOTEST_LDADD) + +messenger_test_SOURCES = ../auto_tests/bootstrap_test.c +messenger_test_CFLAGS = $(AUTO_TEST_CFLAGS) +messenger_test_LDADD = $(AUTOTEST_LDADD) + +network_test_SOURCES = ../auto_tests/bootstrap_test.c +network_test_CFLAGS = $(AUTO_TEST_CFLAGS) +network_test_LDADD = $(AUTOTEST_LDADD) + +onion_test_SOURCES = ../auto_tests/bootstrap_test.c +onion_test_CFLAGS = $(AUTO_TEST_CFLAGS) +onion_test_LDADD = $(AUTOTEST_LDADD) + +overflow_recvq_test_SOURCES = ../auto_tests/bootstrap_test.c +overflow_recvq_test_CFLAGS = $(AUTO_TEST_CFLAGS) +overflow_recvq_test_LDADD = $(AUTOTEST_LDADD) + +overflow_sendq_test_SOURCES = ../auto_tests/bootstrap_test.c +overflow_sendq_test_CFLAGS = $(AUTO_TEST_CFLAGS) +overflow_sendq_test_LDADD = $(AUTOTEST_LDADD) + +save_friend_test_SOURCES = ../auto_tests/bootstrap_test.c +save_friend_test_CFLAGS = $(AUTO_TEST_CFLAGS) +save_friend_test_LDADD = $(AUTOTEST_LDADD) + +save_load_test_SOURCES = ../auto_tests/bootstrap_test.c +save_load_test_CFLAGS = $(AUTO_TEST_CFLAGS) +save_load_test_LDADD = $(AUTOTEST_LDADD) + +send_message_test_SOURCES = ../auto_tests/bootstrap_test.c +send_message_test_CFLAGS = $(AUTO_TEST_CFLAGS) +send_message_test_LDADD = $(AUTOTEST_LDADD) + +set_name_test_SOURCES = ../auto_tests/bootstrap_test.c +set_name_test_CFLAGS = $(AUTO_TEST_CFLAGS) +set_name_test_LDADD = $(AUTOTEST_LDADD) + +set_status_message_test_SOURCES = ../auto_tests/bootstrap_test.c +set_status_message_test_CFLAGS = $(AUTO_TEST_CFLAGS) +set_status_message_test_LDADD = $(AUTOTEST_LDADD) + +skeleton_test_SOURCES = ../auto_tests/bootstrap_test.c +skeleton_test_CFLAGS = $(AUTO_TEST_CFLAGS) +skeleton_test_LDADD = $(AUTOTEST_LDADD) + +tcp_relay_test_SOURCES = ../auto_tests/bootstrap_test.c +tcp_relay_test_CFLAGS = $(AUTO_TEST_CFLAGS) +tcp_relay_test_LDADD = $(AUTOTEST_LDADD) + +TCP_test_SOURCES = ../auto_tests/bootstrap_test.c +TCP_test_CFLAGS = $(AUTO_TEST_CFLAGS) +TCP_test_LDADD = $(AUTOTEST_LDADD) + +tox_many_tcp_test_SOURCES = ../auto_tests/bootstrap_test.c +tox_many_tcp_test_CFLAGS = $(AUTO_TEST_CFLAGS) +tox_many_tcp_test_LDADD = $(AUTOTEST_LDADD) + +tox_many_test_SOURCES = ../auto_tests/bootstrap_test.c +tox_many_test_CFLAGS = $(AUTO_TEST_CFLAGS) +tox_many_test_LDADD = $(AUTOTEST_LDADD) + +tox_one_test_SOURCES = ../auto_tests/bootstrap_test.c +tox_one_test_CFLAGS = $(AUTO_TEST_CFLAGS) +tox_one_test_LDADD = $(AUTOTEST_LDADD) + +tox_strncasecmp_test_SOURCES = ../auto_tests/bootstrap_test.c +tox_strncasecmp_test_CFLAGS = $(AUTO_TEST_CFLAGS) tox_strncasecmp_test_LDADD = $(AUTOTEST_LDADD) +typing_test_SOURCES = ../auto_tests/bootstrap_test.c +typing_test_CFLAGS = $(AUTO_TEST_CFLAGS) +typing_test_LDADD = $(AUTOTEST_LDADD) + +version_test_SOURCES = ../auto_tests/bootstrap_test.c +version_test_CFLAGS = $(AUTO_TEST_CFLAGS) +version_test_LDADD = $(AUTOTEST_LDADD) + +if BUILD_AV + +toxav_basic_test_SOURCES = ../auto_tests/toxav_basic_test.c +toxav_basic_test_CFLAGS = $(AUTOTEST_CFLAGS) +toxav_basic_test_LDADD = $(AUTOTEST_LDADD) $(AV_LIBS) + +toxav_many_test_SOURCES = ../auto_tests/toxav_many_test.c +toxav_many_test_CFLAGS = $(AUTOTEST_CFLAGS) +toxav_many_test_LDADD = $(AUTOTEST_LDADD) + +endif + +endif + EXTRA_DIST += $(top_srcdir)/auto_tests/check_compat.h