Merge test config into suite config, instead of having two distinct configs
[strongswan.git] / src / conftest / conftest.h
index f318fd9..2caf9b3 100644 (file)
 #include <library.h>
 #include <hydra.h>
 #include <daemon.h>
+#include <credentials/sets/mem_cred.h>
+
+#include "config.h"
+#include "actions.h"
 
 typedef struct conftest_t conftest_t;
 
@@ -32,14 +36,34 @@ typedef struct conftest_t conftest_t;
 struct conftest_t {
 
        /**
-        * Global testsuite configuration
+        * Merged suite/test configuration
         */
-       settings_t *suite;
+       settings_t *test;
 
        /**
-        * Test specific configuration
+        * Directory containing suite files
         */
-       settings_t *test;
+       char *suite_dir;
+
+       /**
+        * Credentials loaded from configuration
+        */
+       mem_cred_t *creds;
+
+       /**
+        * Configurations loaded from config
+        */
+       config_t *config;
+
+       /**
+        * Loaded hooks
+        */
+       linked_list_t *hooks;
+
+       /**
+        * Action handling
+        */
+       actions_t *actions;
 };
 
 /**