diff options
| author | Alan Conway <aconway@apache.org> | 2013-06-27 20:05:32 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2013-06-27 20:05:32 +0000 |
| commit | 8ed873da8bb200d92e1461181b5c4bcb16edc9f2 (patch) | |
| tree | 5afef4cbe6ff80e61b09dd58b194692f5fcc08c8 /qpid/cpp/src | |
| parent | a93a50ad6cba81a05053a05bdfa0837569d5486e (diff) | |
| download | qpid-python-8ed873da8bb200d92e1461181b5c4bcb16edc9f2.tar.gz | |
QPID-4961: Fix make distcheck problems with qpidd-p0 script.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1497549 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index 7aa8add442..808d9f9731 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -374,25 +374,20 @@ EXTRA_DIST+= \ topic_perftest \ sasl_test_setup.sh \ run_msg_group_tests_soak \ - qpidd-empty.conf + qpidd-empty.conf \ + qpidd-p0 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 install_env.sh sasl_config qpidd-p0 +check-am: python_prep test_env.sh install_env.sh sasl_config PYTHON_SRC_DIR=$(abs_srcdir)/../../../python PYTHON_BLD_DIR=$(abs_builddir)/python -# Copy qpidd-p0 to build directory so tests can find it easily. -qpidd-p0: force - cp $(abs_srcdir)/qpidd-p0 . - -force: - # Generate python client as part of the all-am target so it gets built before tests. -all-am: python_prep qpidd-p0 +all-am: python_prep python_prep: if test -d $(PYTHON_SRC_DIR); \ |