From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 21 Aug 2013 14:12:24 +0000 (+0100)
Subject: Improve test suite by using standard glib test options.
X-Git-Tag: 0.6.0~216
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5607e21b22008b2f23d9f86aeeb0562f8a6671b8;p=rspamd.git

Improve test suite by using standard glib test options.
---

diff --git a/test/rspamd_rcl_test.c b/test/rspamd_rcl_test.c
index 0c338035f..089f96452 100644
--- a/test/rspamd_rcl_test.c
+++ b/test/rspamd_rcl_test.c
@@ -49,6 +49,8 @@ const gchar *rcl_test_valid[] = {
 		"key3 = 111some,"
 		"key4: s1,"
 		"\"key5\": \"\\n\\r123\"",
+		/* Macros */
+		"section1 {key = value; .include \"./test.cfg\"}",
 		NULL
 };
 
diff --git a/test/rspamd_test_suite.c b/test/rspamd_test_suite.c
index d249ee1fe..7fb655347 100644
--- a/test/rspamd_test_suite.c
+++ b/test/rspamd_test_suite.c
@@ -3,36 +3,20 @@
 #include "../src/cfg_file.h"
 #include "tests.h"
 
-static gboolean do_debug;
 struct rspamd_main             *rspamd_main = NULL;
 struct event_base              *base = NULL;
 worker_t *workers[] = { NULL };
 
-static GOptionEntry entries[] =
-{
-  { "debug", 'd', 0, G_OPTION_ARG_NONE, &do_debug, "Turn on debug messages", NULL },
-  { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
-};
 
 int
 main (int argc, char **argv)
 {
 	struct config_file            *cfg;
-	GError                         *error = NULL;
-	GOptionContext                 *context;
-
-	context = g_option_context_new ("- run rspamd test suite");
-	g_option_context_set_summary (context, "Summary:\n  Rspamd test suite version " RVERSION);
-	g_option_context_add_main_entries (context, entries, NULL);
-	if (!g_option_context_parse (context, &argc, &argv, &error)) {
-		fprintf (stderr, "option parsing failed: %s\n", error->message);
-		exit (1);
-	}
-
-	g_mem_set_vtable(glib_mem_profiler_table);
 
 	g_test_init (&argc, &argv, NULL);
 
+	g_mem_set_vtable (glib_mem_profiler_table);
+
 	rspamd_main = (struct rspamd_main *)g_malloc (sizeof (struct rspamd_main));
 
 #if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION <= 30))
@@ -48,7 +32,7 @@ main (int argc, char **argv)
 
 	base = event_init ();
 
-	if (do_debug) {
+	if (g_test_verbose ()) {
 		cfg->log_level = G_LOG_LEVEL_DEBUG;
 	}
 	else {
diff --git a/test/test.cfg b/test/test.cfg
new file mode 100644
index 000000000..880b363d4
--- /dev/null
+++ b/test/test.cfg
@@ -0,0 +1,5 @@
+section2  {
+	param = "value";
+	param2 = value
+	array = [ 100500, 10s, 50mb ]
+}