From 6bb0134ca322b6e50e6ec76a242f89259cd12274 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 30 Nov 2009 19:34:36 +0000 Subject: Clean up test environment variables, prepare for running more tests in cmake. - consolidate test env vars in test_env.sh, also useful from command line. - generate test_env.sh with autoconf/cmake to cover library location differences. - Remove explicit mention of .libs, use $QPID_MODULE_DIR to load modules. - Fix run_test to run valgrind under cmake git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@885557 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/test_tools.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/src/tests/test_tools.h') diff --git a/qpid/cpp/src/tests/test_tools.h b/qpid/cpp/src/tests/test_tools.h index 4174751173..bb2509fd32 100644 --- a/qpid/cpp/src/tests/test_tools.h +++ b/qpid/cpp/src/tests/test_tools.h @@ -28,6 +28,8 @@ #include #include #include +#include +#include // Print a sequence template std::ostream& seqPrint(std::ostream& o, const T& seq) { @@ -106,8 +108,11 @@ inline std::string getLibPath(const char* envName, const char* defaultPath = 0) const char* p = std::getenv(envName); if (p != 0) return p; - if (defaultPath == 0) - BOOST_FAIL("Environment variable " << envName << " not set."); + if (defaultPath == 0) { + std::ostringstream msg; + msg << "Environment variable " << envName << " not set."; + throw std::runtime_error(msg.str()); + } return defaultPath; } -- cgit v1.2.1