diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/lib/common/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/qpidc.spec.in | 2 | ||||
| -rw-r--r-- | cpp/rpm/Makefile.am | 5 | ||||
| -rw-r--r-- | cpp/tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | cpp/tests/daemon_test | 18 | ||||
| -rwxr-xr-x | cpp/tests/run-python-tests | 7 |
6 files changed, 21 insertions, 14 deletions
diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am index e90dacb605..b118026005 100644 --- a/cpp/lib/common/Makefile.am +++ b/cpp/lib/common/Makefile.am @@ -111,7 +111,7 @@ nobase_pkginclude_HEADERS = \ ExceptionHolder.h \ QpidError.h \ SharedObject.h \ - CommonOptions.cpp \ + CommonOptions.h \ sys/Acceptor.h \ sys/AtomicCount.h \ sys/Module.h \ diff --git a/cpp/qpidc.spec.in b/cpp/qpidc.spec.in index 871e8b9c86..e0d719b51c 100644 --- a/cpp/qpidc.spec.in +++ b/cpp/qpidc.spec.in @@ -5,7 +5,7 @@ Name: @PACKAGE@ Version: @VERSION@ -Release: 4%{?dist} +Release: 5%-M2 Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: Apache Software License diff --git a/cpp/rpm/Makefile.am b/cpp/rpm/Makefile.am index 363a444f4f..710874ff19 100644 --- a/cpp/rpm/Makefile.am +++ b/cpp/rpm/Makefile.am @@ -2,10 +2,11 @@ # Build RPMs from the distribution tarball. # -# TODO aconway 2006-12-21: use autoconf macros for version, base name etc. +abs_top_srcdir=@abs_top_srcdir@ +abs_builddir=@abs_builddir@ SPEC=${top_srcdir}/qpidc.spec -RPMOPTS=--define "_sourcedir ${abs_top_srcdir}" --define "_topdir ${abs_builddir}" +RPMOPTS=--define "_sourcedir ${abs_top_srcdir}" --define "_topdir ${abs_builddir}" --define "_dist -incubator-M2" clean-local: -rm -rf BUILD RPMS SOURCES SPECS SRPMS diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am index 4a9eda4864..2e3bf289c5 100644 --- a/cpp/tests/Makefile.am +++ b/cpp/tests/Makefile.am @@ -14,7 +14,6 @@ EXTRA_DIST = \ .vg-supp \ setup \ env \ - broker \ topicall \ topictest \ qpid_test_plugin.h \ diff --git a/cpp/tests/daemon_test b/cpp/tests/daemon_test index 23f7f7d687..a137e247f0 100755 --- a/cpp/tests/daemon_test +++ b/cpp/tests/daemon_test @@ -5,18 +5,20 @@ TEMP=`mktemp` trap 'rm -f $TEMP' 0 +qpidd=../src/qpidd +client_test=./client_test fail() { echo FAIL: $0:$* 1>&2; exit 1; } # Start and stop daemon. -PID=`qpidd --check --ppid` && fail $LINENO: qpidd already running $PID -qpidd -d || $LINENO: qpidd -d failed -qpidd --check || fail $LINENO: qpidd --check says qpidd didnt start -client_test > $TEMP || fail $LINENO: client_test: `cat $TEMP` -qpidd -q || fail $LINENO: qpidd -q failed -qpidd -d || fail $LINENO: restart after quit failed. -qpidd -k || fail $LINENO: qpidd -k failed +PID=`$qpidd --check --ppid` && fail $LINENO: qpidd already running $PID +$qpidd -d || $LINENO: qpidd -d failed +$qpidd --check || fail $LINENO: qpidd --check says qpidd didnt start +$client_test > $TEMP || fail $LINENO: client_test: `cat $TEMP` +$qpidd -q || fail $LINENO: qpidd -q failed +$qpidd -d || fail $LINENO: restart after quit failed. +$qpidd -k || fail $LINENO: qpidd -k failed # Supress expected message re. cleanup of old PID file. -PID=`qpidd --check --ppid 2>/dev/null` && fail $LINENO: $PID still running after kill. +PID=`$qpidd --check --ppid 2>/dev/null` && fail $LINENO: $PID still running after kill. true diff --git a/cpp/tests/run-python-tests b/cpp/tests/run-python-tests index d9b78e1055..c19b2f0193 100755 --- a/cpp/tests/run-python-tests +++ b/cpp/tests/run-python-tests @@ -1,5 +1,10 @@ #!/bin/bash +test -x $abs_srcdir/../../python/run-tests || { + echo WARNING: Python tests not available, skipping. + exit 0; +} + if test "$VERBOSE" = yes; then set -x qpidd --version @@ -18,7 +23,7 @@ sleep 4 # Run the tests. ( cd $abs_srcdir/../../python \ - && python ./run-tests -v -I cpp_failing.txt || fail=1 ) + && python ./run-tests -v -I cpp_failing.txt ) || fail=1 kill $pid || { echo FAIL: process already died; cat log; fail=1; } |