aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2010-11-11 15:52:32 +0100
committerMartin Willi <martin@revosec.ch>2011-01-05 16:45:45 +0100
commit2712b113c7068f793e86d08b118bb5856401cc5f (patch)
tree9bf24e286e1d170fcee9415367be4d5c7b2ea0f1
parente330360f7773d3ed77e5b0fda00aaba50604906f (diff)
downloadstrongswan-2712b113c7068f793e86d08b118bb5856401cc5f.tar.bz2
strongswan-2712b113c7068f793e86d08b118bb5856401cc5f.tar.xz
Prefer test specific over suite specific configuration
-rw-r--r--src/conftest/conftest.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c
index 38ec833ca..7de88ce73 100644
--- a/src/conftest/conftest.c
+++ b/src/conftest/conftest.c
@@ -400,8 +400,8 @@ int main(int argc, char *argv[])
return 1;
}
charon->backends->add_backend(charon->backends, &conftest->config->backend);
- conftest->config->load(conftest->config, conftest->suite);
conftest->config->load(conftest->config, conftest->test);
+ conftest->config->load(conftest->config, conftest->suite);
conftest->actions = actions_create();
/* set up thread specific handlers */