svn commit: r546842 - in /incubator/qpid/trunk/qpid/cpp: Makefile.am src/Makefile.am src/tests/Makefile.am src/tests/start_broker

[gs...@apache.org]

Author: gsim
Date: Wed Jun 13 05:41:49 2007
New Revision: 546842

URL: http://svn.apache.org/viewvc?view=rev&rev=546842
Log:
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


Modified:
    incubator/qpid/trunk/qpid/cpp/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/tests/start_broker

Modified: incubator/qpid/trunk/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile.am?view=diff&rev=546842&r1=546841&r2=546842
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile.am Wed Jun 13 05:41:49 2007
@@ -9,7 +9,7 @@
   $(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)

Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=546842&r1=546841&r2=546842
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Wed Jun 13 05:41:49 2007
@@ -76,6 +76,7 @@
 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 \

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?view=diff&rev=546842&r1=546841&r2=546842
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Wed Jun 13 05:41:49 2007
@@ -80,7 +80,7 @@
 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							\

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/start_broker
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/start_broker?view=diff&rev=546842&r1=546841&r2=546842
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/start_broker (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/start_broker Wed Jun 13 05:41:49 2007
@@ -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`