Added a merge option to optionally reload files instead of merging them

2011-04-15 10:07:13 +02:00
parent ed49e9a303
commit 32973044b0
3 changed files with 32 additions and 13 deletions
@@ -79,7 +79,7 @@ static bool load_configs(char *suite_file, char *test_file)
 		return FALSE;
 	}
 	conftest->test = settings_create(suite_file);
-	conftest->test->load_files(conftest->test, test_file);
+	conftest->test->load_files(conftest->test, test_file, TRUE);
 	conftest->suite_dir = strdup(dirname(suite_file));
 	return TRUE;
 }