From: Martin Willi <martin@revosec.ch>
Date: Thu, 11 Nov 2010 14:52:32 +0000 (+0100)
Subject: Prefer test specific over suite specific configuration
X-Git-Tag: 4.5.1~285
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2712b113c7068f793e86d08b118bb5856401cc5f;p=thirdparty%2Fstrongswan.git

Prefer test specific over suite specific configuration
---

diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c
index 38ec833caa..7de88ce73b 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 */