diff options
| author | Gordon Sim <gsim@apache.org> | 2007-06-13 12:41:49 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2007-06-13 12:41:49 +0000 |
| commit | 9367367969d72676d54bb518377a990c52d444f0 (patch) | |
| tree | 0e1b815abd701b81c067dbd429b7637da8a1d16b /cpp | |
| parent | b59dcd9cfcdc5898c8d1c3b55a28065a4fc4ce68 (diff) | |
| download | qpid-python-9367367969d72676d54bb518377a990c52d444f0.tar.gz | |
Various minor fixes to build and test process:
* cpp/src/tests/start_broker - removed use of the now invalid --ppid option
* cpp/src/tests/Makefile.am - make running of ais tests dependent on inclusion of cluster
* cpp/src/Makefile.am - added missing PrivatePosix.h file to dist
* cpp/Makefile.am - added examples to list of sub dirs
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@546842 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/src/Makefile.am | 1 | ||||
| -rw-r--r-- | cpp/src/tests/Makefile.am | 2 | ||||
| -rwxr-xr-x | cpp/src/tests/start_broker | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/cpp/Makefile.am b/cpp/Makefile.am index 460908ed7c..515b811a29 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -9,7 +9,7 @@ EXTRA_DIST = \ $(SPEC) $(SPEC).in \ rpm/README.qpidd-devel -SUBDIRS = src docs/api docs/man +SUBDIRS = src docs/api docs/man examples # Update libtool, if needed. libtool: $(LIBTOOL_DEPS) diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 75cc670015..3dcbda5085 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -76,6 +76,7 @@ posix_plat_src = \ posix_plat_hdr = \ qpid/sys/posix/check.h \ qpid/sys/posix/Condition.h \ + qpid/sys/posix/PrivatePosix.h \ qpid/sys/posix/Module.h \ qpid/sys/posix/Mutex.h \ qpid/sys/posix/Socket.h \ diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index e5f6c39ac5..cd14bd57ab 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -80,7 +80,7 @@ check_PROGRAMS = $(UNIT_TESTS) $(AIS_UNIT_TESTS) $(testprogs) interop_runner TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) SYSTEM_TESTS = client_test quick_topictest -TESTS = $(UNIT_TESTS) run-unit-tests ais_unit_tests start_broker $(SYSTEM_TESTS) python_tests kill_broker daemon_test +TESTS = $(UNIT_TESTS) run-unit-tests $(RUN_AIS_TESTS) start_broker $(SYSTEM_TESTS) python_tests kill_broker daemon_test EXTRA_DIST = \ test_env run_test \ diff --git a/cpp/src/tests/start_broker b/cpp/src/tests/start_broker index 515a3a2b5e..92a12e6e8a 100755 --- a/cpp/src/tests/start_broker +++ b/cpp/src/tests/start_broker @@ -1,5 +1,5 @@ #!/bin/sh fail() { echo FAIL: $0:$* 1>&2; exit 1; } qpidd=../qpidd -PID=`$qpidd --check --ppid` && fail $qpidd already running $PID +PID=`$qpidd --check` && fail $qpidd already running $PID $qpidd --log.output qpidd.log --daemon || fail $qpidd startup: `cat qpidd.log` |