Added verify scripts to run mixed python/cpp examples.

bin/verify_all runs all examples.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@619941 13f79535-47bb-0310-9956-ffa450edef68

16 files changed, 214 insertions, 15 deletions

diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am
index f4882d2c7d..fdbea3b878 100644
--- a/cpp/examples/Makefile.am
+++ b/cpp/examples/Makefile.am
@@ -17,17 +17,7 @@ nobase_pkgdata_DATA=						\
 	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 @@ installcheck-local:
 	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)
diff --git a/cpp/examples/examples/direct/verify_cpp_python b/cpp/examples/examples/direct/verify_cpp_python
new file mode 100644
index 0000000000..5ce3681d90
--- /dev/null
+++ b/cpp/examples/examples/direct/verify_cpp_python
@@ -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
diff --git a/cpp/examples/examples/direct/verify_cpp_python.in b/cpp/examples/examples/direct/verify_cpp_python.in
new file mode 100644
index 0000000000..0952dbe405
--- /dev/null
+++ b/cpp/examples/examples/direct/verify_cpp_python.in
@@ -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!
diff --git a/cpp/examples/examples/direct/verify_python_cpp b/cpp/examples/examples/direct/verify_python_cpp
new file mode 100644
index 0000000000..43c5339150
--- /dev/null
+++ b/cpp/examples/examples/direct/verify_python_cpp
@@ -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
+
diff --git a/cpp/examples/examples/direct/verify_python_cpp.in b/cpp/examples/examples/direct/verify_python_cpp.in
new file mode 100644
index 0000000000..b1907e6c3b
--- /dev/null
+++ b/cpp/examples/examples/direct/verify_python_cpp.in
@@ -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
diff --git a/cpp/examples/examples/fanout/verify b/cpp/examples/examples/fanout/verify
index 9febd5777c..1e1e8121d2 100644
--- a/cpp/examples/examples/fanout/verify
+++ b/cpp/examples/examples/fanout/verify
@@ -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
diff --git a/cpp/examples/examples/fanout/verify_cpp_python b/cpp/examples/examples/fanout/verify_cpp_python
new file mode 100644
index 0000000000..59fa63478c
--- /dev/null
+++ b/cpp/examples/examples/fanout/verify_cpp_python
@@ -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
+
diff --git a/cpp/examples/examples/fanout/verify_cpp_python.in b/cpp/examples/examples/fanout/verify_cpp_python.in
new file mode 100644
index 0000000000..141e7c6a84
--- /dev/null
+++ b/cpp/examples/examples/fanout/verify_cpp_python.in
@@ -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!
diff --git a/cpp/examples/examples/fanout/verify_python_cpp b/cpp/examples/examples/fanout/verify_python_cpp
new file mode 100644
index 0000000000..cef36bd287
--- /dev/null
+++ b/cpp/examples/examples/fanout/verify_python_cpp
@@ -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
+
diff --git a/cpp/examples/examples/pub-sub/verify_cpp_python b/cpp/examples/examples/pub-sub/verify_cpp_python
new file mode 100644
index 0000000000..ff711a310f
--- /dev/null
+++ b/cpp/examples/examples/pub-sub/verify_cpp_python
@@ -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"
+
diff --git a/cpp/examples/examples/pub-sub/verify_cpp_python.in b/cpp/examples/examples/pub-sub/verify_cpp_python.in
new file mode 100644
index 0000000000..9e033dc25c
--- /dev/null
+++ b/cpp/examples/examples/pub-sub/verify_cpp_python.in
@@ -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!
diff --git a/cpp/examples/examples/pub-sub/verify_python_cpp b/cpp/examples/examples/pub-sub/verify_python_cpp
new file mode 100644
index 0000000000..e9c72c94d7
--- /dev/null
+++ b/cpp/examples/examples/pub-sub/verify_python_cpp
@@ -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"
+
diff --git a/cpp/examples/examples/pub-sub/verify_python_cpp.in b/cpp/examples/examples/pub-sub/verify_python_cpp.in
new file mode 100644
index 0000000000..6f92458792
--- /dev/null
+++ b/cpp/examples/examples/pub-sub/verify_python_cpp.in
@@ -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
diff --git a/cpp/examples/examples/request-response/verify_cpp_python b/cpp/examples/examples/request-response/verify_cpp_python
new file mode 100644
index 0000000000..9470110bc2
--- /dev/null
+++ b/cpp/examples/examples/request-response/verify_cpp_python
@@ -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"
diff --git a/cpp/examples/examples/request-response/verify_cpp_python.in b/cpp/examples/examples/request-response/verify_cpp_python.in
new file mode 100644
index 0000000000..efffc32332
--- /dev/null
+++ b/cpp/examples/examples/request-response/verify_cpp_python.in
@@ -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 ...)
diff --git a/cpp/examples/examples/request-response/verify_python_cpp b/cpp/examples/examples/request-response/verify_python_cpp
new file mode 100644
index 0000000000..11f5c4cbc4
--- /dev/null
+++ b/cpp/examples/examples/request-response/verify_python_cpp
@@ -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"