Re-enable control_test

diff --git a/src/tests/bin/all.mk b/src/tests/bin/all.mk
index b344b2eccecba499aee7719097bcf8e9229ca893..95b09f9259d610106768b537e3211a6cd2a16e3f 100644 (file)
--- a/src/tests/bin/all.mk
+++ b/src/tests/bin/all.mk
@@ -2,6 +2,7 @@ TEST    := test.bin
 
 FILES  := \
        atomic_queue_test       \
+       control_test            \
        radclient               \
        radict                  \
        radmin                  \
@@ -34,6 +35,7 @@ $(eval $(call TEST_BOOTSTRAP))
 #
 #  Some tests take arguments, others do not.
 #
+control_test.ARGS = -m 1000 -w 32
 radclient.ARGS = -h
 radict.ARGS = -D $(top_srcdir)/share/dictionary User-Name
 radmin.ARGS = -h

diff --git a/src/tests/util/all.mk b/src/tests/util/all.mk
index f8e30e766a425de3aba3b235022f7bb3f5d02a9a..e7a73d26d939bc98f0a6c3cc586c0e945dd6e70c 100644 (file)
--- a/src/tests/util/all.mk
+++ b/src/tests/util/all.mk
@@ -1,9 +1,4 @@
-SUBMAKEFILES := ring_buffer_test.mk message_set_test.mk atomic_queue_test.mk 
-
-#
-#  This uses an old API, and we don't have time to fix it.
-#
-#control_test.mk 
+SUBMAKEFILES := ring_buffer_test.mk message_set_test.mk atomic_queue_test.mk control_test.mk
 
 #
 #  These require pthread.