From 73ac27cc798ea965054348b2b967a07e08ae0570 Mon Sep 17 00:00:00 2001 From: Paul Fultz II Date: Sun, 18 Mar 2018 00:50:33 -0500 Subject: [PATCH] Fix loading library when running tests from build directory (#1123) --- test/testsuite.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testsuite.h b/test/testsuite.h index 0bfc07eb5..457d36a3b 100644 --- a/test/testsuite.h +++ b/test/testsuite.h @@ -99,7 +99,7 @@ extern std::ostringstream output; #ifdef _WIN32 #define LOAD_LIB_2( LIB, NAME ) { if (((LIB).load("./testrunner", "../cfg/" NAME).errorcode != Library::OK) && ((LIB).load("./testrunner", "cfg/" NAME).errorcode != Library::OK)) { complainMissingLib(NAME); return; } } #else -#define LOAD_LIB_2( LIB, NAME ) { if ((LIB).load("./testrunner", "cfg/" NAME).errorcode != Library::OK) { complainMissingLib(NAME); return; } } +#define LOAD_LIB_2( LIB, NAME ) { if (((LIB).load("./testrunner", "cfg/" NAME).errorcode != Library::OK) && ((LIB).load("./bin/testrunner", "bin/cfg/" NAME).errorcode != Library::OK)) { complainMissingLib(NAME); return; } } #endif #endif