diff options
| author | Alan Conway <aconway@apache.org> | 2009-11-30 19:34:36 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-11-30 19:34:36 +0000 |
| commit | 6bb0134ca322b6e50e6ec76a242f89259cd12274 (patch) | |
| tree | 74ab33d008364a6b72fd879a0ad99693c42da33c /qpid/cpp/src/tests/cluster_test.cpp | |
| parent | f4b13c8d16754f29a331fe7ec2c7e1bc7995c524 (diff) | |
| download | qpid-python-6bb0134ca322b6e50e6ec76a242f89259cd12274.tar.gz | |
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
Diffstat (limited to 'qpid/cpp/src/tests/cluster_test.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/cluster_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/cluster_test.cpp b/qpid/cpp/src/tests/cluster_test.cpp index 7ca58415dc..a2e18b8f78 100644 --- a/qpid/cpp/src/tests/cluster_test.cpp +++ b/qpid/cpp/src/tests/cluster_test.cpp @@ -72,7 +72,7 @@ bool durableFlag = std::getenv("STORE_LIB") != 0; void prepareArgs(ClusterFixture::Args& args, const bool durableFlag = false) { ostringstream clusterLib; - clusterLib << getLibPath("CLUSTER_LIB", "../.libs/cluster.so"); + clusterLib << getLibPath("CLUSTER_LIB"); args += "--auth", "no", "--no-module-dir", "--load-module", clusterLib.str(); if (durableFlag) args += "--load-module", getLibPath("STORE_LIB"), "TMP_DATA_DIR"; @@ -227,7 +227,7 @@ QPID_AUTO_TEST_CASE(testAcl) { char cwd[1024]; BOOST_CHECK(::getcwd(cwd, sizeof(cwd))); ostringstream aclLib; - aclLib << getLibPath("ACL_LIB", "../.libs/acl.so"); + aclLib << getLibPath("ACL_LIB"); ClusterFixture::Args args; prepareArgs(args, durableFlag); args += "--log-enable=critical"; // Supress expected errors |