From 2712b113c7068f793e86d08b118bb5856401cc5f Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 11 Nov 2010 15:52:32 +0100 Subject: [PATCH] Prefer test specific over suite specific configuration --- src/conftest/conftest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */