diff options
author | irungentoo <irungentoo@gmail.com> | 2013-11-06 17:43:37 -0800 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-11-06 17:43:37 -0800 |
commit | af62804c949c9243b962c27a6536fba5c0483c62 (patch) | |
tree | 6948620385c1bddbc1597f729fa936e11cebee18 | |
parent | 4bf4b3f47c373b7cdea54f5cb2d2fada1bc598e1 (diff) | |
parent | fdefb18fc1e2a97cc1df9344283601e0ad614a1e (diff) |
Merge pull request #641 from FullName/autotests_reduce
Reduce duplicate data. Add a mostly empty skeleton test.
-rw-r--r-- | auto_tests/Makefile.inc | 50 | ||||
-rw-r--r-- | auto_tests/skeleton_test.c | 53 |
2 files changed, 72 insertions, 31 deletions
diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc index 6c59eebb..9c06bc78 100644 --- a/auto_tests/Makefile.inc +++ b/auto_tests/Makefile.inc | |||
@@ -4,15 +4,12 @@ TESTS = messenger_autotest crypto_test network_test | |||
4 | 4 | ||
5 | check_PROGRAMS = messenger_autotest crypto_test network_test | 5 | check_PROGRAMS = messenger_autotest crypto_test network_test |
6 | 6 | ||
7 | messenger_autotest_SOURCES = \ | 7 | AUTOTEST_CFLAGS = \ |
8 | ../auto_tests/messenger_test.c | 8 | $(LIBSODIUM_CFLAGS) \ |
9 | 9 | $(NACL_CFLAGS) \ | |
10 | messenger_autotest_CFLAGS = \ | 10 | $(CHECK_CFLAGS) |
11 | $(LIBSODIUM_CFLAGS) \ | 11 | |
12 | $(NACL_CFLAGS) \ | 12 | AUTOTEST_LDADD = \ |
13 | $(CHECK_CFLAGS) | ||
14 | |||
15 | messenger_autotest_LDADD = \ | ||
16 | $(LIBSODIUM_LDFLAGS) \ | 13 | $(LIBSODIUM_LDFLAGS) \ |
17 | $(NACL_LDFLAGS) \ | 14 | $(NACL_LDFLAGS) \ |
18 | libtoxcore.la \ | 15 | libtoxcore.la \ |
@@ -20,35 +17,26 @@ messenger_autotest_LDADD = \ | |||
20 | $(NACL_LIBS) \ | 17 | $(NACL_LIBS) \ |
21 | $(CHECK_LIBS) | 18 | $(CHECK_LIBS) |
22 | 19 | ||
20 | messenger_autotest_SOURCES = ../auto_tests/messenger_test.c | ||
21 | |||
22 | messenger_autotest_CFLAGS = $(AUTOTEST_CFLAGS) | ||
23 | |||
24 | messenger_autotest_LDADD = $(AUTOTEST_LDADD) | ||
25 | |||
23 | 26 | ||
24 | crypto_test_SOURCES = ../auto_tests/crypto_test.c | 27 | crypto_test_SOURCES = ../auto_tests/crypto_test.c |
25 | 28 | ||
26 | crypto_test_CFLAGS = $(LIBSODIUM_CFLAGS) \ | 29 | crypto_test_CFLAGS = $(AUTOTEST_CFLAGS) |
27 | $(NACL_CFLAGS) \ | ||
28 | $(CHECK_CFLAGS) | ||
29 | 30 | ||
30 | crypto_test_LDADD = $(LIBSODIUM_LDFLAGS) \ | 31 | crypto_test_LDADD = $(AUTOTEST_LDADD) |
31 | $(NACL_LDFLAGS) \ | ||
32 | libtoxcore.la \ | ||
33 | $(LIBSODIUM_LIBS) \ | ||
34 | $(NACL_LIBS) \ | ||
35 | $(CHECK_LIBS) | ||
36 | 32 | ||
37 | network_test_SOURCES = \ | ||
38 | ../auto_tests/network_test.c | ||
39 | 33 | ||
40 | network_test_CFLAGS = \ | 34 | network_test_SOURCES = ../auto_tests/network_test.c |
41 | $(LIBSODIUM_CFLAGS) \ | 35 | |
42 | $(NACL_CFLAGS) \ | 36 | network_test_CFLAGS = $(AUTOTEST_CFLAGS) |
43 | $(CHECK_CFLAGS) | 37 | |
38 | network_test_LDADD = $(AUTOTEST_LDADD) | ||
44 | 39 | ||
45 | network_test_LDADD = \ | ||
46 | $(LIBSODIUM_LDFLAGS) \ | ||
47 | $(NACL_LDFLAGS) \ | ||
48 | libtoxcore.la \ | ||
49 | $(LIBSODIUM_LIBS) \ | ||
50 | $(NACL_LIBS) \ | ||
51 | $(CHECK_LIBS) | ||
52 | 40 | ||
53 | endif | 41 | endif |
54 | 42 | ||
diff --git a/auto_tests/skeleton_test.c b/auto_tests/skeleton_test.c new file mode 100644 index 00000000..89ef1b8b --- /dev/null +++ b/auto_tests/skeleton_test.c | |||
@@ -0,0 +1,53 @@ | |||
1 | #ifdef HAVE_CONFIG_H | ||
2 | #include "config.h" | ||
3 | #endif | ||
4 | |||
5 | #include <sys/types.h> | ||
6 | #include <stdint.h> | ||
7 | #include <string.h> | ||
8 | #include <check.h> | ||
9 | #include <stdlib.h> | ||
10 | #include <time.h> | ||
11 | |||
12 | /* | ||
13 | #include "../<stuff to test>" | ||
14 | */ | ||
15 | |||
16 | START_TEST(test_creativetestnamegoeshere) | ||
17 | { | ||
18 | uint8_t test = 0; | ||
19 | ck_assert_msg(test == 0, "test: expected result 0, got %u.", test); | ||
20 | } | ||
21 | END_TEST | ||
22 | |||
23 | |||
24 | #define DEFTESTCASE(NAME) \ | ||
25 | TCase *tc_##NAME = tcase_create(#NAME); \ | ||
26 | tcase_add_test(tc_##NAME, test_##NAME); \ | ||
27 | suite_add_tcase(s, tc_##NAME); | ||
28 | |||
29 | Suite *creativesuitenamegoeshere_suite(void) | ||
30 | { | ||
31 | Suite *s = suite_create("creativesuitedescritptiongoeshere"); | ||
32 | |||
33 | DEFTESTCASE(/* remove test_ from test function names */ creativetestnamegoeshere); | ||
34 | |||
35 | return s; | ||
36 | } | ||
37 | |||
38 | int main(int argc, char *argv[]) | ||
39 | { | ||
40 | srand((unsigned int) time(NULL)); | ||
41 | |||
42 | Suite *creativesuitenamegoeshere = creativesuitenamegoeshere_suite(); | ||
43 | SRunner *test_runner = srunner_create(creativesuitenamegoeshere); | ||
44 | |||
45 | int number_failed = 0; | ||
46 | srunner_run_all(test_runner, CK_NORMAL); | ||
47 | number_failed = srunner_ntests_failed(test_runner); | ||
48 | |||
49 | srunner_free(test_runner); | ||
50 | |||
51 | return number_failed; | ||
52 | } | ||
53 | |||