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/Makefile.am | |
| 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/Makefile.am')
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index 44e1574968..dc677c5862 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -23,6 +23,7 @@ PUBLIC_INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include # Use public abs_builddir=@abs_builddir@ abs_srcdir=@abs_srcdir@ + extra_libs = lib_client = $(abs_builddir)/../libqpidclient.la lib_common = $(abs_builddir)/../libqpidcommon.la @@ -280,12 +281,7 @@ qpid_stream_LDADD=$(lib_client) TESTS_ENVIRONMENT = \ VALGRIND=$(VALGRIND) \ LIBTOOL="$(LIBTOOL)" \ - srcdir=$(srcdir) \ - top_builddir=$(top_builddir) \ QPID_DATA_DIR= \ - ACL_LIB=../.libs/acl.so \ - CLUSTER_LIB=../.libs/cluster.so \ - TEST_STORE_LIB=.libs/test_store.so \ BOOST_TEST_SHOW_PROGRESS=yes \ $(srcdir)/run_test @@ -332,7 +328,6 @@ LONG_TESTS+=start_broker fanout_perftest shared_perftest multiq_perftest topic_p EXTRA_DIST+= \ CMakeLists.txt \ - python_env.sh \ fanout_perftest \ shared_perftest \ multiq_perftest \ |