Merge test config into suite config, instead of having two distinct configs
[strongswan.git] / src / conftest / conftest.h
index 614248e..2caf9b3 100644 (file)
@@ -25,6 +25,9 @@
 #include <daemon.h>
 #include <credentials/sets/mem_cred.h>
 
+#include "config.h"
+#include "actions.h"
+
 typedef struct conftest_t conftest_t;
 
 /**
@@ -33,12 +36,7 @@ typedef struct conftest_t conftest_t;
 struct conftest_t {
 
        /**
-        * Global testsuite configuration
-        */
-       settings_t *suite;
-
-       /**
-        * Test specific configuration
+        * Merged suite/test configuration
         */
        settings_t *test;
 
@@ -48,19 +46,24 @@ struct conftest_t {
        char *suite_dir;
 
        /**
-        * Directory containing test files
+        * Credentials loaded from configuration
         */
-       char *test_dir;
+       mem_cred_t *creds;
 
        /**
-        * Credentials loaded from configuration
+        * Configurations loaded from config
         */
-       mem_cred_t *creds;
+       config_t *config;
 
        /**
         * Loaded hooks
         */
        linked_list_t *hooks;
+
+       /**
+        * Action handling
+        */
+       actions_t *actions;
 };
 
 /**