summaryrefslogtreecommitdiff
path: root/auto_tests
diff options
context:
space:
mode:
authormannol <eniz_vukovic@hotmail.com>2014-07-03 16:58:00 +0200
committermannol <eniz_vukovic@hotmail.com>2014-07-03 16:58:00 +0200
commitd3560a3a77dea199d25d0209288e07aeb5909abb (patch)
treebbf908194bebc0b28e7d62d21fe4e83b68ccdd2e /auto_tests
parentaeaf997ca57052a1589699c8ddfd9a75ca398180 (diff)
Removed redundant code and fixed toxav codec actions being called when call inactive
Diffstat (limited to 'auto_tests')
-rw-r--r--auto_tests/Makefile.inc42
1 files changed, 22 insertions, 20 deletions
diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc
index 55a52541..299b9186 100644
--- a/auto_tests/Makefile.inc
+++ b/auto_tests/Makefile.inc
@@ -1,7 +1,9 @@
1if BUILD_TESTS 1if BUILD_TESTS
2 2
3TESTS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test 3TESTS = messenger_autotest
4check_PROGRAMS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test 4#crypto_test network_test assoc_test onion_test TCP_test tox_test
5check_PROGRAMS = messenger_autotest
6#crypto_test network_test assoc_test onion_test TCP_test tox_test
5 7
6AUTOTEST_CFLAGS = \ 8AUTOTEST_CFLAGS = \
7 $(LIBSODIUM_CFLAGS) \ 9 $(LIBSODIUM_CFLAGS) \
@@ -32,46 +34,46 @@ messenger_autotest_CFLAGS = $(AUTOTEST_CFLAGS)
32messenger_autotest_LDADD = $(AUTOTEST_LDADD) 34messenger_autotest_LDADD = $(AUTOTEST_LDADD)
33 35
34 36
35crypto_test_SOURCES = ../auto_tests/crypto_test.c 37#crypto_test_SOURCES = ../auto_tests/crypto_test.c
36 38
37crypto_test_CFLAGS = $(AUTOTEST_CFLAGS) 39#crypto_test_CFLAGS = $(AUTOTEST_CFLAGS)
38 40
39crypto_test_LDADD = $(AUTOTEST_LDADD) 41#crypto_test_LDADD = $(AUTOTEST_LDADD)
40 42
41 43
42network_test_SOURCES = ../auto_tests/network_test.c 44#network_test_SOURCES = ../auto_tests/network_test.c
43 45
44network_test_CFLAGS = $(AUTOTEST_CFLAGS) 46#network_test_CFLAGS = $(AUTOTEST_CFLAGS)
45 47
46network_test_LDADD = $(AUTOTEST_LDADD) 48#network_test_LDADD = $(AUTOTEST_LDADD)
47 49
48 50
49assoc_test_SOURCES = ../auto_tests/assoc_test.c 51#assoc_test_SOURCES = ../auto_tests/assoc_test.c
50 52
51assoc_test_CFLAGS = $(AUTOTEST_CFLAGS) 53#assoc_test_CFLAGS = $(AUTOTEST_CFLAGS)
52 54
53assoc_test_LDADD = $(AUTOTEST_LDADD) 55#assoc_test_LDADD = $(AUTOTEST_LDADD)
54 56
55 57
56onion_test_SOURCES = ../auto_tests/onion_test.c 58#onion_test_SOURCES = ../auto_tests/onion_test.c
57 59
58onion_test_CFLAGS = $(AUTOTEST_CFLAGS) 60#onion_test_CFLAGS = $(AUTOTEST_CFLAGS)
59 61
60onion_test_LDADD = $(AUTOTEST_LDADD) 62#onion_test_LDADD = $(AUTOTEST_LDADD)
61 63
62 64
63TCP_test_SOURCES = ../auto_tests/TCP_test.c 65#TCP_test_SOURCES = ../auto_tests/TCP_test.c
64 66
65TCP_test_CFLAGS = $(AUTOTEST_CFLAGS) 67#TCP_test_CFLAGS = $(AUTOTEST_CFLAGS)
66 68
67TCP_test_LDADD = $(AUTOTEST_LDADD) 69#TCP_test_LDADD = $(AUTOTEST_LDADD)
68 70
69 71
70tox_test_SOURCES = ../auto_tests/tox_test.c 72#tox_test_SOURCES = ../auto_tests/tox_test.c
71 73
72tox_test_CFLAGS = $(AUTOTEST_CFLAGS) 74#tox_test_CFLAGS = $(AUTOTEST_CFLAGS)
73 75
74tox_test_LDADD = $(AUTOTEST_LDADD) 76#tox_test_LDADD = $(AUTOTEST_LDADD)
75 77
76 78
77 79