svn commit: r533840 - in /incubator/qpid/branches/M2/cpp: lib/common/Makefile.am qpidc.spec.in rpm/Makefile.am tests/Makefile.am tests/daemon_test tests/run-python-tests

[ac...@apache.org]

Author: aconway
Date: Mon Apr 30 12:52:28 2007
New Revision: 533840

URL: http://svn.apache.org/viewvc?view=rev&rev=533840
Log:

Added -M2 tag to RPM release.

Modified:
    incubator/qpid/branches/M2/cpp/lib/common/Makefile.am
    incubator/qpid/branches/M2/cpp/qpidc.spec.in
    incubator/qpid/branches/M2/cpp/rpm/Makefile.am
    incubator/qpid/branches/M2/cpp/tests/Makefile.am
    incubator/qpid/branches/M2/cpp/tests/daemon_test
    incubator/qpid/branches/M2/cpp/tests/run-python-tests

Modified: incubator/qpid/branches/M2/cpp/lib/common/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/cpp/lib/common/Makefile.am?view=diff&rev=533840&r1=533839&r2=533840
==============================================================================
--- incubator/qpid/branches/M2/cpp/lib/common/Makefile.am (original)
+++ incubator/qpid/branches/M2/cpp/lib/common/Makefile.am Mon Apr 30 12:52:28 2007
@@ -111,7 +111,7 @@
   ExceptionHolder.h				\
   QpidError.h					\
   SharedObject.h				\
-  CommonOptions.cpp				\
+  CommonOptions.h				\
   sys/Acceptor.h				\
   sys/AtomicCount.h				\
   sys/Module.h					\

Modified: incubator/qpid/branches/M2/cpp/qpidc.spec.in
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/cpp/qpidc.spec.in?view=diff&rev=533840&r1=533839&r2=533840
==============================================================================
--- incubator/qpid/branches/M2/cpp/qpidc.spec.in (original)
+++ incubator/qpid/branches/M2/cpp/qpidc.spec.in Mon Apr 30 12:52:28 2007
@@ -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

Modified: incubator/qpid/branches/M2/cpp/rpm/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/cpp/rpm/Makefile.am?view=diff&rev=533840&r1=533839&r2=533840
==============================================================================
--- incubator/qpid/branches/M2/cpp/rpm/Makefile.am (original)
+++ incubator/qpid/branches/M2/cpp/rpm/Makefile.am Mon Apr 30 12:52:28 2007
@@ -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

Modified: incubator/qpid/branches/M2/cpp/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/cpp/tests/Makefile.am?view=diff&rev=533840&r1=533839&r2=533840
==============================================================================
--- incubator/qpid/branches/M2/cpp/tests/Makefile.am (original)
+++ incubator/qpid/branches/M2/cpp/tests/Makefile.am Mon Apr 30 12:52:28 2007
@@ -14,7 +14,6 @@
   .vg-supp		\
   setup			\
   env			\
-  broker		\
   topicall		\
   topictest		\
   qpid_test_plugin.h	\

Modified: incubator/qpid/branches/M2/cpp/tests/daemon_test
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/cpp/tests/daemon_test?view=diff&rev=533840&r1=533839&r2=533840
==============================================================================
--- incubator/qpid/branches/M2/cpp/tests/daemon_test (original)
+++ incubator/qpid/branches/M2/cpp/tests/daemon_test Mon Apr 30 12:52:28 2007
@@ -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

Modified: incubator/qpid/branches/M2/cpp/tests/run-python-tests
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/cpp/tests/run-python-tests?view=diff&rev=533840&r1=533839&r2=533840
==============================================================================
--- incubator/qpid/branches/M2/cpp/tests/run-python-tests (original)
+++ incubator/qpid/branches/M2/cpp/tests/run-python-tests Mon Apr 30 12:52:28 2007
@@ -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 @@
 
 # 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; }