diff options
| author | Alan Conway <aconway@apache.org> | 2007-04-30 19:52:28 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-04-30 19:52:28 +0000 |
| commit | 6dfec93461aaf1ddf7dbd681bc67e6edcb8d81d3 (patch) | |
| tree | d6beaf1290b2d16d9c18d0c05dff7916063b15fb /cpp/tests | |
| parent | b16914a34d89e4b99eceb0a3f5b277d454c4e39f (diff) | |
| download | qpid-python-6dfec93461aaf1ddf7dbd681bc67e6edcb8d81d3.tar.gz | |
Added -M2 tag to RPM release.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@533840 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/tests')
| -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 |
3 files changed, 16 insertions, 10 deletions
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; } |