Author: chug
Date: Tue Apr 10 18:06:14 2012
New Revision: 1311894
URL: http://svn.apache.org/viewvc?rev=1311894&view=rev
Log:
QPID-3901: merge fix to 0.16 branch
Modified:
qpid/branches/0.16/qpid/cpp/src/tests/Makefile.am (contents, props
changed)
Modified: qpid/branches/0.16/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/branches/0.16/qpid/cpp/src/tests/Makefile.am?rev=1311894&r1=1311893&r2=1311894&view=diff
==============================================================================
--- qpid/branches/0.16/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/branches/0.16/qpid/cpp/src/tests/Makefile.am Tue Apr 10 18:06:14 2012
@@ -352,7 +352,8 @@ EXTRA_DIST +=
\
run_queue_flow_limit_tests \
run_msg_group_tests \
ipv6_test \
- ha_tests.py
+ ha_tests.py \
+ test_env.ps1.in
check_LTLIBRARIES += libdlclose_noop.la
libdlclose_noop_la_LDFLAGS = -module -rpath $(abs_builddir)
Propchange: qpid/branches/0.16/qpid/cpp/src/tests/Makefile.am
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 10 18:06:14 2012
@@ -0,0 +1,9 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/src/tests/Makefile.am:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/src/tests/Makefile.am:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/tests/Makefile.am:926803,927233
+/qpid/branches/QPID-2519/cpp/src/tests/Makefile.am:1072051-1079078
+/qpid/branches/QPID-3799-acl/cpp/src/tests/Makefile.am:1291401-1295617
+/qpid/branches/java-network-refactor/qpid/cpp/src/tests/Makefile.am:805429-825319
+/qpid/branches/qpid-2935/qpid/cpp/src/tests/Makefile.am:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/src/tests/Makefile.am:1144319-1179855
+/qpid/trunk/qpid/cpp/src/tests/Makefile.am:1301512
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
