diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | cpp/examples/examples/fanout/verify_cpp_python | 2 | ||||
| -rw-r--r-- | cpp/examples/examples/fanout/verify_cpp_python.in | 4 | ||||
| -rw-r--r-- | cpp/examples/examples/pub-sub/verify_cpp_python | 2 | ||||
| -rw-r--r-- | cpp/examples/examples/pub-sub/verify_cpp_python.in | 2 | ||||
| -rw-r--r-- | cpp/examples/examples/request-response/verify_cpp_python | 2 | ||||
| -rw-r--r-- | cpp/examples/examples/request-response/verify_cpp_python.in | 2 | ||||
| -rw-r--r-- | cpp/examples/examples/request-response/verify_python_cpp | 2 | ||||
| -rw-r--r-- | cpp/examples/examples/request-response/verify_python_cpp.in | 4 | ||||
| -rwxr-xr-x | cpp/examples/verify_all | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am index 20a0a24531..6d1d122744 100644 --- a/cpp/examples/Makefile.am +++ b/cpp/examples/Makefile.am @@ -64,8 +64,8 @@ all-local: # to find .spec via PYTHONPATH. # # Verify the examples in the buid tree. -# check-local: all-local verify -# $(srcdir)/verify_all $(abs_top_srcdir)/.. +check-local: all-local verify + $(srcdir)/verify_all $(abs_top_srcdir)/.. # TODO: # create a tarball for testing installed examples. diff --git a/cpp/examples/examples/fanout/verify_cpp_python b/cpp/examples/examples/fanout/verify_cpp_python index e840e68f91..6a1ba7ad7d 100644 --- a/cpp/examples/examples/fanout/verify_cpp_python +++ b/cpp/examples/examples/fanout/verify_cpp_python @@ -3,5 +3,5 @@ py=$PYTHON_EXAMPLES/fanout background "Subscribed" $py/fanout_consumer.py background "Subscribed" $py/fanout_consumer.py clients ./fanout_producer -outputs ./fanout_producer.out "$py/fanout_consumer.py.out | remove_uuid64" "$py/fanout_consumer.pyX.out | remove_uuid64" +outputs ./fanout_producer.out "$py/fanout_consumer.py.out | remove_uuid" "$py/fanout_consumer.pyX.out | remove_uuid" diff --git a/cpp/examples/examples/fanout/verify_cpp_python.in b/cpp/examples/examples/fanout/verify_cpp_python.in index fac2b365d3..6a4c2616d8 100644 --- a/cpp/examples/examples/fanout/verify_cpp_python.in +++ b/cpp/examples/examples/fanout/verify_cpp_python.in @@ -1,5 +1,5 @@ ==== fanout_producer.out -==== fanout_consumer.py.out | remove_uuid64 +==== fanout_consumer.py.out | remove_uuid Messages queue: Subscribed to queue Response: Message 0 @@ -14,7 +14,7 @@ Response: Message 8 Response: Message 9 Response: That's all, folks! No more messages! -==== fanout_consumer.pyX.out | remove_uuid64 +==== fanout_consumer.pyX.out | remove_uuid Messages queue: Subscribed to queue Response: Message 0 diff --git a/cpp/examples/examples/pub-sub/verify_cpp_python b/cpp/examples/examples/pub-sub/verify_cpp_python index ecc573eed3..f6c6850981 100644 --- a/cpp/examples/examples/pub-sub/verify_cpp_python +++ b/cpp/examples/examples/pub-sub/verify_cpp_python @@ -2,5 +2,5 @@ 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" +outputs ./topic_publisher.out "$py/topic_subscriber.py.out | remove_uuid | sort" diff --git a/cpp/examples/examples/pub-sub/verify_cpp_python.in b/cpp/examples/examples/pub-sub/verify_cpp_python.in index b3c9e750f5..d16eab0f6c 100644 --- a/cpp/examples/examples/pub-sub/verify_cpp_python.in +++ b/cpp/examples/examples/pub-sub/verify_cpp_python.in @@ -1,5 +1,5 @@ ==== topic_publisher.out -==== topic_subscriber.py.out | remove_uuid64 | sort +==== topic_subscriber.py.out | remove_uuid | sort Message 0 Message 0 Message 0 diff --git a/cpp/examples/examples/request-response/verify_cpp_python b/cpp/examples/examples/request-response/verify_cpp_python index 9d71d51c37..5701af3bbc 100644 --- a/cpp/examples/examples/request-response/verify_cpp_python +++ b/cpp/examples/examples/request-response/verify_cpp_python @@ -2,4 +2,4 @@ background "Request server running" $PYTHON_EXAMPLES/request-response/server.py clients ./client kill %% # Must kill the server. -outputs "./client.out | remove_uuid" "$PYTHON_EXAMPLES/request-response/server.py.out | remove_uuid64" +outputs "./client.out | remove_uuid" "$PYTHON_EXAMPLES/request-response/server.py.out | remove_uuid" diff --git a/cpp/examples/examples/request-response/verify_cpp_python.in b/cpp/examples/examples/request-response/verify_cpp_python.in index 280484bd2a..a032293d9b 100644 --- a/cpp/examples/examples/request-response/verify_cpp_python.in +++ b/cpp/examples/examples/request-response/verify_cpp_python.in @@ -10,6 +10,6 @@ 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 -==== server.py.out | remove_uuid64 +==== server.py.out | remove_uuid 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 index 9f3f1caaf4..d6f0fa7152 100644 --- a/cpp/examples/examples/request-response/verify_python_cpp +++ b/cpp/examples/examples/request-response/verify_python_cpp @@ -2,4 +2,4 @@ background "Waiting" ./server clients $PYTHON_EXAMPLES/request-response/client.py kill %% # Must kill the server. -outputs "$PYTHON_EXAMPLES/request-response/client.py.out | remove_uuid64" "server.out | remove_uuid64" +outputs "$PYTHON_EXAMPLES/request-response/client.py.out | remove_uuid" "server.out | remove_uuid" diff --git a/cpp/examples/examples/request-response/verify_python_cpp.in b/cpp/examples/examples/request-response/verify_python_cpp.in index 7718d54973..41ec500774 100644 --- a/cpp/examples/examples/request-response/verify_python_cpp.in +++ b/cpp/examples/examples/request-response/verify_python_cpp.in @@ -1,4 +1,4 @@ -==== client.py.out | remove_uuid64 +==== client.py.out | remove_uuid Request: Twas brilling, and the slithy toves Request: Did gyre and gimble in the wabe. Request: All mimsy were the borogroves, @@ -9,7 +9,7 @@ Response: DID GYRE AND GIMBLE IN THE WABE. Response: ALL MIMSY WERE THE BOROGROVES, Response: AND THE MOME RATHS OUTGRABE. No more messages! -==== server.out | remove_uuid64 +==== server.out | remove_uuid Activating request queue listener for: request Waiting for requests Request: Twas brilling, and the slithy toves (ReplyTo:) diff --git a/cpp/examples/verify_all b/cpp/examples/verify_all index 5501239021..f5e6aed3ea 100755 --- a/cpp/examples/verify_all +++ b/cpp/examples/verify_all @@ -11,7 +11,7 @@ trap "$qpidd -q" exit export QPID_PORT=`$qpidd -dp0 --data-dir ""` export PYTHON_EXAMPLES=$python/examples export PYTHONPATH=$python:$PYTHONPATH -export AMQP_SPEC=$srcdir/specs/amqp.0-10-preview.xml +export AMQP_SPEC=$srcdir/specs/amqp.0-10.xml test -d $PYTHON_EXAMPLES || echo "Warning: not verifying python examples, $PYTHON_EXAMPLES not found" find="find examples" |