Merge test config into suite config, instead of having two distinct configs
[strongswan.git] / src / conftest / conftest.h
index 2d32e6c..2caf9b3 100644 (file)
@@ -36,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;
 
@@ -51,11 +46,6 @@ struct conftest_t {
        char *suite_dir;
 
        /**
-        * Directory containing test files
-        */
-       char *test_dir;
-
-       /**
         * Credentials loaded from configuration
         */
        mem_cred_t *creds;