diff -r bd444539cced -r 18823857ce79 ucx/test.h
--- a/ucx/test.h	Mon Feb 25 16:26:50 2013 +0100
+++ b/ucx/test.h	Wed Feb 27 09:41:17 2013 +0100
@@ -82,9 +82,10 @@
         longjmp(_env_, 1);\
     }
 
-#define UCX_TEST_SUBROUTINE(name,data) void name(UcxTestSuite* _suite_,\
-        FILE *_output_, jmp_buf _env_, void* data)
-#define UCX_TEST_CALL_SUBROUTINE(name,data) name(_suite_,_output_,_env_,data);
+#define UCX_TEST_SUBROUTINE(name,...) void name(UcxTestSuite* _suite_,\
+        FILE *_output_, jmp_buf _env_, __VA_ARGS__)
+#define UCX_TEST_CALL_SUBROUTINE(name,...) \
+        name(_suite_,_output_,_env_,__VA_ARGS__);
 
 #define UCX_TEST_END fwrite("success.\n", 1, 9, _output_); _suite_->success++;}