Patch from Manuel Teira: https://issues.apache.org/jira/secure/CommentAssignIssue!default.jspa?action=5&id=12398038

 - Use standard automake makefiles to build cpp/examples.
 - Rationalize examples directory structure.

Additions to patch:
 - Fix for VPATH builds.
 - Fix make distcheck (finally!)


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

5 files changed, 21 insertions, 21 deletions

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 626e948667..26f6dc7964 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -318,7 +318,6 @@ libqpidclient_la_SOURCES =			\
   qpid/client/Connector.cpp			\
   qpid/client/Connection.cpp			\
   qpid/client/ConnectionHandler.cpp		\
-  qpid/client/ChainableFrameHandler.h		\
   qpid/client/ConnectionSettings.cpp		\
   qpid/client/Demux.cpp				\
   qpid/client/Dispatcher.cpp			\
@@ -434,6 +433,7 @@ nobase_include_HEADERS = \
   qpid/client/AckMode.h \
   qpid/client/AckPolicy.h			\
   qpid/client/Bounds.h \
+  qpid/client/ChainableFrameHandler.h		\
   qpid/client/Completion.h \
   qpid/client/Connection.h \
   qpid/client/ConnectionHandler.h \
diff --git a/cpp/src/tests/.valgrindrc b/cpp/src/tests/.valgrindrc
deleted file mode 100644
index 4aba7661de..0000000000
--- a/cpp/src/tests/.valgrindrc
+++ /dev/null
@@ -1,7 +0,0 @@
---gen-suppressions=all
---leak-check=full
---demangle=yes
---suppressions=.valgrind.supp
---num-callers=25
---trace-children=yes
-
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 57d1c04b72..c8d94c18e9 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -131,7 +131,6 @@ EXTRA_DIST +=								\
   topictest								\
   run_federation_tests							\
   .valgrind.supp							\
-  .valgrindrc								\
   MessageUtils.h							\
   TestMessageStore.h							\
   MockConnectionInputHandler.h						\
diff --git a/cpp/src/tests/cluster.mk b/cpp/src/tests/cluster.mk
index ba8d99935f..d373a7d6ab 100644
--- a/cpp/src/tests/cluster.mk
+++ b/cpp/src/tests/cluster.mk
@@ -11,7 +11,7 @@ lib_cluster = $(abs_builddir)/../libqpidcluster.la
 
 # ais_check checks conditions for AIS tests and runs if ok.
 TESTS+=ais_check
-EXTRA_DIST+=ais_check ais_run
+EXTRA_DIST+=ais_check ais_run start_cluster stop_cluster
 
 check_PROGRAMS+=ais_test
 ais_test_SOURCES=ais_test.cpp Cpg.cpp 
diff --git a/cpp/src/tests/run_test b/cpp/src/tests/run_test
index 08bf845ba1..c535c8caaa 100755
--- a/cpp/src/tests/run_test
+++ b/cpp/src/tests/run_test
@@ -14,34 +14,42 @@
 
 srcdir=`dirname $0`
 source $srcdir/vg_check
-test -f .valgrindrc || cp $srcdir/.valgrindrc .
-test -f .valgrind.supp || cp $srcdir/.valgrind.supp .
-
 
 # Export variables from makefile.
 export VALGRIND srcdir
 
-# Export QPID_PORT if qpidd.port exists.
-test -f qpidd.port && export QPID_PORT=`cat qpidd.port`
+# Set QPID_PORT if qpidd.port exists.
+test -f qpidd.port && QPID_PORT=`cat qpidd.port`
+export QPID_PORT
 
 # Avoid silly libtool error messages if these are not defined
-test -z "$LC_ALL" && export LC_ALL=
-test -z "$LC_CTYPE" && export LC_CTYPE=
-test -z "$LC_COLLATE" && export LC_COLLATE=
-test -z "$LC_MESSAGES" && export LC_MESSAGES=
+test -z "$LC_ALL" && LC_ALL=
+test -z "$LC_CTYPE" && LC_CTYPE=
+test -z "$LC_COLLATE" && LC_COLLATE=
+test -z "$LC_MESSAGES" && LC_MESSAGES=
+export LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 
 VG_LOG="$1.vglog"
 rm -f $VG_LOG*
 
+VALGRIND_OPTS="
+--gen-suppressions=all
+--leak-check=full
+--demangle=yes
+--suppressions=$srcdir/.valgrind.supp
+--num-callers=25
+--trace-children=yes
+--log-file=$VG_LOG --
+"
+
 if grep -l "^# Generated by .*libtool" "$1" >/dev/null 2>&1; then
     # This is a libtool "executable". Valgrind it if VALGRIND specified.
-    test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file=$VG_LOG --"
+    test -n "$VALGRIND" && VALGRIND="$VALGRIND $VALGRIND_OPTS"
     # Hide output unless there's an error.
     libtool --mode=execute $VALGRIND "$@" 2>&1 || ERROR=$?
     test -n "$VALGRIND" && vg_check $VG_LOG*
 else
     # This is a non-libtool shell script, just execute it.
-    export VALGRIND srcdir
     exec "$@"
 fi