aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-11-09 10:54:00 +0100
committerNick Mathewson <nickm@torproject.org>2011-11-11 11:47:25 -0500
commit38123ffa23355d4607987a9fd0dc7b0595e787a7 (patch)
treefd21df5d3f352a0fb7dcf2bc2870fb237c074156
parent46d236c68428a0fd0f008ec2a34ae08f1640b9b7 (diff)
downloadtor-38123ffa23355d4607987a9fd0dc7b0595e787a7.tar.gz
tor-38123ffa23355d4607987a9fd0dc7b0595e787a7.zip
Fix the bench_{aes,dmap} test functions to work with TT
TT expects them to be named test_bench_{aes,dmap}. Also change the DISABLED macro to reflect that.
-rw-r--r--changes/test_bench5
-rw-r--r--src/test/test.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/changes/test_bench b/changes/test_bench
new file mode 100644
index 0000000000..8ae895b116
--- /dev/null
+++ b/changes/test_bench
@@ -0,0 +1,5 @@
+ o Minor bugfixes:
+ - Rename the bench_{aes,dmap} functions to test_*, so that tinytest can
+ pick them up when the tests aren't disabled. Bugfix on 0.2.2.4-alpha
+ which introduced tinytest.
+
diff --git a/src/test/test.c b/src/test/test.c
index aca7f10e60..185bf5a30c 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1267,7 +1267,7 @@ test_policies(void)
/** Run AES performance benchmarks. */
static void
-bench_aes(void)
+test_bench_aes(void)
{
int len, i;
char *b1, *b2;
@@ -1299,7 +1299,7 @@ bench_aes(void)
/** Run digestmap_t performance benchmarks. */
static void
-bench_dmap(void)
+test_bench_dmap(void)
{
smartlist_t *sl = smartlist_create();
smartlist_t *sl2 = smartlist_create();
@@ -1899,7 +1899,7 @@ const struct testcase_setup_t legacy_setup = {
{ #group "_" #name, legacy_test_helper, 0, &legacy_setup, \
test_ ## group ## _ ## name }
#define DISABLED(name) \
- { #name, legacy_test_helper, TT_SKIP, &legacy_setup, name }
+ { #name, legacy_test_helper, TT_SKIP, &legacy_setup, test_ ## name }
#define FORK(name) \
{ #name, legacy_test_helper, TT_FORK, &legacy_setup, test_ ## name }