summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/Makefile.am
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-09-27 19:41:23 +0000
committerAlan Conway <aconway@apache.org>2010-09-27 19:41:23 +0000
commitbbee097fc24cc07a0ec5eacff757d068fd9c6a83 (patch)
tree0e87593c2009e9c344e90cdfe5cb1d88ecff4c51 /qpid/cpp/src/tests/Makefile.am
parentad992d967371b001c77c1c79e2b701948d1c5775 (diff)
downloadqpid-python-bbee097fc24cc07a0ec5eacff757d068fd9c6a83.tar.gz
Added install_env.sh to set environment variables to use an install prefix.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1001887 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/Makefile.am')
-rw-r--r--qpid/cpp/src/tests/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index 0e61a40c29..02454971cb 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -148,8 +148,8 @@ endif
# Test programs that are installed and therefore built as part of make, not make check
-qpidtest_SCRIPTS += qpid-cpp-benchmark
-EXTRA_DIST += qpid-cpp-benchmark
+qpidtest_SCRIPTS += qpid-cpp-benchmark install_env.sh
+EXTRA_DIST += qpid-cpp-benchmark install_env.sh
qpidtest_PROGRAMS += receiver
receiver_SOURCES = \
@@ -377,7 +377,7 @@ check-long:
$(MAKE) check TESTS="$(LONG_TESTS)" VALGRIND=
# Things that should be built before the check target runs.
-check-am: python_prep test_env.sh sasl_config
+check-am: python_prep test_env.sh install_env.sh sasl_config
PYTHON_SRC_DIR=$(abs_srcdir)/../../../python
PYTHON_BLD_DIR=$(abs_builddir)/python
@@ -402,3 +402,4 @@ clean-local:
rm -rf $(CLEAN_LOCAL)
include testagent.mk
+