diff options
| author | Martin Willi <martin@revosec.ch> | 2011-04-12 11:13:08 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-04-15 10:07:13 +0200 |
| commit | 32973044b0cf27d1eb764761459939424117b511 (patch) | |
| tree | d43cd338012464defc66cba046c4ed569236dc74 /src/conftest | |
| parent | ed49e9a30313a3e9967dc0cbb5a1f05dcf5f930c (diff) | |
| download | strongswan-32973044b0cf27d1eb764761459939424117b511.tar.bz2 strongswan-32973044b0cf27d1eb764761459939424117b511.tar.xz | |
Added a merge option to optionally reload files instead of merging them
Diffstat (limited to 'src/conftest')
| -rw-r--r-- | src/conftest/conftest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c index fea88818e..48bf9681f 100644 --- a/src/conftest/conftest.c +++ b/src/conftest/conftest.c @@ -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; } |