diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-15 12:20:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-15 12:20:17 -0400 |
| commit | b163e801bcc96f4720a0ac2bf1ade5eb2701a9c1 (patch) | |
| tree | 84398ad7b6ae2142370f2121ea19255c9fdcd118 /src/test/test.c | |
| parent | ed600832d9fcd9ac6b2aacd36114f65ff227daf9 (diff) | |
| parent | 0cf327dc7874ae0a021054b78cbb7b24a11aa8fe (diff) | |
| download | tor-b163e801bcc96f4720a0ac2bf1ade5eb2701a9c1.tar tor-b163e801bcc96f4720a0ac2bf1ade5eb2701a9c1.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/or/routerlist.c
Diffstat (limited to 'src/test/test.c')
| -rw-r--r-- | src/test/test.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/test/test.c b/src/test/test.c index 41ab421a9..bd2fa0bb2 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -2066,11 +2066,6 @@ const struct testcase_setup_t legacy_setup = { #define ENT(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_ ## name } -#define SUBENT(group, name) \ - { #group "_" #name, legacy_test_helper, 0, &legacy_setup, \ - test_ ## group ## _ ## name } -#define DISABLED(name) \ - { #name, legacy_test_helper, TT_SKIP, &legacy_setup, test_ ## name } #define FORK(name) \ { #name, legacy_test_helper, TT_FORK, &legacy_setup, test_ ## name } |