diff options
Diffstat (limited to 'cpp/examples')
| -rw-r--r-- | cpp/examples/Makefile.am | 8 | ||||
| -rw-r--r-- | cpp/examples/examples/pub-sub/verify.in | 1 | ||||
| -rwxr-xr-x | cpp/examples/verify | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am index e5fc509eac..aa68c151ab 100644 --- a/cpp/examples/Makefile.am +++ b/cpp/examples/Makefile.am @@ -17,12 +17,14 @@ nobase_pkgdata_DATA= \ examples/direct/listener.cpp \ examples/direct/declare_queues.cpp -EXTRA_DIST=$(nobase_pkgdata_DATA) verify \ +VERIFY_SCRIPT=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) + # Note: we don't use normal automake SUBDIRS because the example # makefiles don't understand all the recursive automake targets. @@ -51,3 +53,7 @@ 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/pub-sub/verify.in b/cpp/examples/examples/pub-sub/verify.in index aa3227388a..0a36b8c5ee 100644 --- a/cpp/examples/examples/pub-sub/verify.in +++ b/cpp/examples/examples/pub-sub/verify.in @@ -1,6 +1,7 @@ ==== ./topic_publisher ==== ==== remove_uuid topic_listener.out | sort +==== Declaring queue: europe Declaring queue: news Declaring queue: usa diff --git a/cpp/examples/verify b/cpp/examples/verify index 10f2226aa5..35c9acae88 100755 --- a/cpp/examples/verify +++ b/cpp/examples/verify @@ -49,7 +49,6 @@ pub_sub() { run ./topic_listener | tee topic_listener.out > topic_listener.wait & waitfor topic_listener.wait "Listening" run ./topic_publisher > verify.out - kill %% wait 2> /dev/null title "remove_uuid topic_listener.out | sort" >> verify.out } |