qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r619941 - in /incubator/qpid/trunk/qpid: bin/ cpp/examples/ cpp/examples/examples/direct/ cpp/examples/examples/fanout/ cpp/examples/examples/pub-sub/ cpp/examples/examples/request-response/
Date Fri, 08 Feb 2008 17:02:57 GMT
Author: aconway
Date: Fri Feb  8 09:02:55 2008
New Revision: 619941

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

Added verify scripts to run mixed python/cpp examples.
bin/verify_all runs all examples.

Added:
    incubator/qpid/trunk/qpid/bin/verify_all   (with props)
    incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python
    incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python.in
    incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp
    incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp.in
    incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python
    incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python.in
    incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_python_cpp
    incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python
    incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python.in
    incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp
    incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp.in
    incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python
    incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python.in
    incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_python_cpp
Modified:
    incubator/qpid/trunk/qpid/bin/verify
    incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
    incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify

Modified: incubator/qpid/trunk/qpid/bin/verify
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/bin/verify?rev=619941&r1=619940&r2=619941&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/bin/verify (original)
+++ incubator/qpid/trunk/qpid/bin/verify Fri Feb  8 09:02:55 2008
@@ -38,17 +38,18 @@
 
 outputs() {
     wait 2> /dev/null		# Wait for all backgroud processes to complete
+    rm -f $script.out
     for f in "$@"; do
-	{ echo "==== $f"; eval "cat $f"; } >> verify.out || fail
+	{ echo "==== $f"; eval "cat $f"; } >> $script.out || fail
     done
 }
 
 verify() {
     FAIL=
-    dir=$1
+    if [ -d $1 ]; then dir=$1; script=verify;
+    else dir=`dirname $1`; script=`basename $1`; fi
     cd $dir || return 1
-    rm -f *.out
-    { source ./verify && diff -ac verify.out verify.in ; } || fail
+    { source ./$script && diff -ac $script.out $script.in ; } || fail
     test -z "$FAIL" && rm -f *.out
     return $FAIL
 }
@@ -67,8 +68,8 @@
     trap "$QPIDD -q" EXIT
 fi
 
-for dir in "$@"; do
-    echo -n "$dir : "
-    if ( verify $dir; ) then echo "PASS";  else echo "FAIL"; RET=1; fi
+for example in "$@"; do
+    echo -n "$example : "
+    if ( verify $example; ) then echo "PASS";  else echo "FAIL"; RET=1; fi
      done
 exit $RET

Added: incubator/qpid/trunk/qpid/bin/verify_all
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/bin/verify_all?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/bin/verify_all (added)
+++ incubator/qpid/trunk/qpid/bin/verify_all Fri Feb  8 09:02:55 2008
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Find example verify scripts and run them.
+# Usage: verify_all search-dir
+
+if [ `basename $1` = examples ]; then exdirs=$1
+else exdirs=`find $1 -name examples -a -type d`; fi
+scripts=`find $exdirs -name verify -o -name verify_cpp_python -o -name verify_cpp_java`
+verify=`dirname $0`/verify
+for s in $scripts; do $verify $s; done
+    
+	
+	

Propchange: incubator/qpid/trunk/qpid/bin/verify_all
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=619941&r1=619940&r2=619941&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Fri Feb  8 09:02:55 2008
@@ -17,17 +17,7 @@
 	examples/direct/listener.cpp				\
 	examples/direct/declare_queues.cpp
 
-VERIFY_SCRIPT= \
-	examples/request-response/verify \
-	examples/fanout/verify \
-	examples/pub-sub/verify \
-	examples/direct/verify \
-	examples/request-response/verify.in \
-	examples/fanout/verify.in \
-	examples/pub-sub/verify.in \
-	examples/direct/verify.in 
-
-EXTRA_DIST=$(nobase_pkgdata_DATA) $(VERIFY_SCRIPT)
+EXTRA_DIST=$(nobase_pkgdata_DATA)
 
 # Note: we don't use normal automake SUBDIRS because the example
 # makefiles don't understand all the recursive automake targets.
@@ -67,7 +57,3 @@
 	cd $(EXAMPLE_DIR) && QPIDD=$(sbindir)/qpidd $(VERIFY)
 	cd $(EXAMPLE_DIR) && $(MAKE) clean
 
-# Tarball with verify script that can be untarred & run on
-# installed examples.
-verify.tar: $(VERIFY_SCRIPT)
-	tar cf verify.tar $(VERIFY_SCRIPT)

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python Fri Feb  8 09:02:55
2008
@@ -0,0 +1,4 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
+py=../../../../python/examples/direct
+clients ./declare_queues ./direct_producer $py/direct_consumer.py
+outputs  ./declare_queues.out ./direct_producer.out $py/direct_consumer.py.out

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python.in?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python.in (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_cpp_python.in Fri Feb  8
09:02:55 2008
@@ -0,0 +1,14 @@
+==== ./declare_queues.out
+==== ./direct_producer.out
+==== ../../../../python/examples/direct/direct_consumer.py.out
+Message 0
+Message 1
+Message 2
+Message 3
+Message 4
+Message 5
+Message 6
+Message 7
+Message 8
+Message 9
+That's all, folks!

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp Fri Feb  8 09:02:55
2008
@@ -0,0 +1,5 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+py=../../../../python/examples/direct
+clients $py/declare_queues.py $py/direct_producer.py  ./listener
+outputs $py/declare_queues.py.out $py/direct_producer.py.out ./listener.out
+

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp.in?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp.in (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/direct/verify_python_cpp.in Fri Feb  8
09:02:55 2008
@@ -0,0 +1,16 @@
+==== ../../../../python/examples/direct/declare_queues.py.out
+==== ../../../../python/examples/direct/direct_producer.py.out
+==== ./listener.out
+Activating listener for: listener_destination
+Message: message 0
+Message: message 1
+Message: message 2
+Message: message 3
+Message: message 4
+Message: message 5
+Message: message 6
+Message: message 7
+Message: message 8
+Message: message 9
+Message: That's all, folks!
+Shutting down listener for listener_destination

Modified: incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify?rev=619941&r1=619940&r2=619941&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify Fri Feb  8 09:02:55 2008
@@ -1,2 +1,3 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
 clients ./declare_queues ./fanout_producer ./listener
 outputs ./declare_queues.out ./fanout_producer.out ./listener.out

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python Fri Feb  8 09:02:55
2008
@@ -0,0 +1,5 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+py=../../../../python/examples/fanout
+clients ./declare_queues ./fanout_producer $py/fanout_consumer.py
+outputs ./declare_queues.out ./fanout_producer.out $py/fanout_consumer.py.out
+

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python.in?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python.in (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_cpp_python.in Fri Feb  8
09:02:55 2008
@@ -0,0 +1,14 @@
+==== ./declare_queues.out
+==== ./fanout_producer.out
+==== ../../../../python/examples/fanout/fanout_consumer.py.out
+Message 0
+Message 1
+Message 2
+Message 3
+Message 4
+Message 5
+Message 6
+Message 7
+Message 8
+Message 9
+That's all, folks!

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_python_cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_python_cpp?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_python_cpp (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/verify_python_cpp Fri Feb  8 09:02:55
2008
@@ -0,0 +1,5 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+py=../../../../python/examples/fanout
+clients $py/declare_queues.py $py/fanout_producer .py ./listener
+outputs $py/declare_queues.py.out $py/fanout_producer.py.out ./listener.out
+

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python Fri Feb  8 09:02:55
2008
@@ -0,0 +1,6 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+py=../../../../python/examples/pubsub
+background "Queues created" $py/topic_subscriber.py
+clients ./topic_publisher
+outputs ./topic_publisher.out "$py/topic_subscriber.py.out | remove_uuid64 | sort"
+

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python.in?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python.in (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_cpp_python.in Fri Feb 
8 09:02:55 2008
@@ -0,0 +1,51 @@
+==== ./topic_publisher.out
+==== ../../../../python/examples/pubsub/topic_subscriber.py.out | remove_uuid64 | sort
+Message 0
+Message 0
+Message 0
+Message 0
+Message 0
+Message 0
+Message 0
+Message 0
+Message 1
+Message 1
+Message 1
+Message 1
+Message 1
+Message 1
+Message 1
+Message 1
+Message 2
+Message 2
+Message 2
+Message 2
+Message 2
+Message 2
+Message 2
+Message 2
+Message 3
+Message 3
+Message 3
+Message 3
+Message 3
+Message 3
+Message 3
+Message 3
+Message 4
+Message 4
+Message 4
+Message 4
+Message 4
+Message 4
+Message 4
+Message 4
+Messages queue: europe
+Messages queue: news
+Messages queue: usa
+Messages queue: weather
+Queues created - please start the topic producer
+That's all, folks!
+That's all, folks!
+That's all, folks!
+That's all, folks!

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp Fri Feb  8 09:02:55
2008
@@ -0,0 +1,6 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+py=../../../../python/examples/pubsub
+background "Listening" ./topic_listener
+clients $py/topic_publisher.py
+outputs $py/topic_publisher.py.out "topic_listener.out | remove_uuid | sort"
+

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp.in?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp.in (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify_python_cpp.in Fri Feb 
8 09:02:55 2008
@@ -0,0 +1,59 @@
+==== ../../../../python/examples/pubsub/topic_publisher.py.out
+==== topic_listener.out | remove_uuid | sort
+Declaring queue: europe
+Declaring queue: news
+Declaring queue: usa
+Declaring queue: weather
+Listening for messages ...
+Message: message 0 from europe
+Message: message 0 from europe
+Message: message 0 from news
+Message: message 0 from news
+Message: message 0 from usa
+Message: message 0 from usa
+Message: message 0 from weather
+Message: message 0 from weather
+Message: message 1 from europe
+Message: message 1 from europe
+Message: message 1 from news
+Message: message 1 from news
+Message: message 1 from usa
+Message: message 1 from usa
+Message: message 1 from weather
+Message: message 1 from weather
+Message: message 2 from europe
+Message: message 2 from europe
+Message: message 2 from news
+Message: message 2 from news
+Message: message 2 from usa
+Message: message 2 from usa
+Message: message 2 from weather
+Message: message 2 from weather
+Message: message 3 from europe
+Message: message 3 from europe
+Message: message 3 from news
+Message: message 3 from news
+Message: message 3 from usa
+Message: message 3 from usa
+Message: message 3 from weather
+Message: message 3 from weather
+Message: message 4 from europe
+Message: message 4 from europe
+Message: message 4 from news
+Message: message 4 from news
+Message: message 4 from usa
+Message: message 4 from usa
+Message: message 4 from weather
+Message: message 4 from weather
+Message: That's all, folks! from europe
+Message: That's all, folks! from news
+Message: That's all, folks! from usa
+Message: That's all, folks! from weather
+Shutting down listener for europe
+Shutting down listener for news
+Shutting down listener for usa
+Shutting down listener for weather
+Subscribing to queue europe
+Subscribing to queue news
+Subscribing to queue usa
+Subscribing to queue weather

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python Fri
Feb  8 09:02:55 2008
@@ -0,0 +1,6 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+py=../../../../python/examples/request-response
+background "Request server running" $py/server.py
+clients ./client
+kill %% 			# Must kill the server.
+outputs "./client.out | remove_uuid" "$py/server.py.out | remove_uuid64"

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python.in?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python.in
(added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_cpp_python.in
Fri Feb  8 09:02:55 2008
@@ -0,0 +1,15 @@
+==== ./client.out | remove_uuid
+Activating response queue listener for: client
+Request: Twas brillig, and the slithy toves
+Request: Did gire and gymble in the wabe.
+Request: All mimsy were the borogroves,
+Request: And the mome raths outgrabe.
+Waiting for all responses to arrive ...
+Response: TWAS BRILLIG, AND THE SLITHY TOVES
+Response: DID GIRE AND GYMBLE IN THE WABE.
+Response: ALL MIMSY WERE THE BOROGROVES,
+Response: AND THE MOME RATHS OUTGRABE.
+Shutting down listener for client
+==== ../../../../python/examples/request-response/server.py.out | remove_uuid64
+Request server running - run your client now.
+(Times out after 100 seconds ...)

Added: incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_python_cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_python_cpp?rev=619941&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_python_cpp (added)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/request-response/verify_python_cpp Fri
Feb  8 09:02:55 2008
@@ -0,0 +1,6 @@
+# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
+py=../../../../python/examples/request-response
+background "Request server running" ./server
+clients $py/client.py
+kill %% 			# Must kill the server.
+outputs "./client.py.out | remove_uuid64" " server.out | remove_uuid"



Mime
View raw message