diff options
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/Makefile.am | 2 | ||||
| -rwxr-xr-x | cpp/src/tests/start_broker | 2 |
2 files changed, 2 insertions, 2 deletions
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` |