svn commit: r1453970 - in /qpid/trunk/qpid/cpp: INSTALL src/tests/CMakeLists.txt src/tests/ha_store_tests.py src/tests/test_env.sh.in

[ac...@apache.org]

Author: aconway
Date: Thu Mar  7 17:25:35 2013
New Revision: 1453970

URL: http://svn.apache.org/r1453970
Log:
QPID-4630: HA enable store tests if legacystore is built.

Modified:
    qpid/trunk/qpid/cpp/INSTALL
    qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
    qpid/trunk/qpid/cpp/src/tests/ha_store_tests.py
    qpid/trunk/qpid/cpp/src/tests/test_env.sh.in

Modified: qpid/trunk/qpid/cpp/INSTALL
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/INSTALL?rev=1453970&r1=1453969&r2=1453970&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/INSTALL (original)
+++ qpid/trunk/qpid/cpp/INSTALL Thu Mar  7 17:25:35 2013
@@ -119,6 +119,9 @@ For the XML Exchange, include:
 Optional ruby binding support include:
  # yum install ruby ruby-devel swig
 
+Optional legacystore store module.
+# yum install libdb-cxx-devel libaio-devel
+
 Follow the manual installation instruction below for any packages not
 available through your distributions packaging tool.
 

Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1453970&r1=1453969&r2=1453970&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Thu Mar  7 17:25:35 2013
@@ -324,6 +324,9 @@ endif (PYTHON_EXECUTABLE)
 add_test (stop_broker ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/stop_broker${test_script_suffix})
 if (PYTHON_EXECUTABLE)
   add_test (ha_tests ${test_wrap} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ha_tests.py)
+  if (BUILD_LEGACYSTORE)
+    add_test (ha_store_tests ${test_wrap} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ha_store_tests.py)
+  endif (BUILD_LEGACYSTORE)
   add_test (ipv6_test ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/ipv6_test${test_script_suffix})
   add_test (federation_tests ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/run_federation_tests${test_script_suffix})
   add_test (federation_sys_tests ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/run_federation_sys_tests${test_script_suffix})

Modified: qpid/trunk/qpid/cpp/src/tests/ha_store_tests.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ha_store_tests.py?rev=1453970&r1=1453969&r2=1453970&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ha_store_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/ha_store_tests.py Thu Mar  7 17:25:35 2013
@@ -20,9 +20,7 @@
 
 """
 This module contains tests for HA functionality that requires a store.
-It is not included as part of "make check" since it will not function
-without a store. Currently it can be run from a build of the message
-store.
+It will only be run if the STORE_LIB environment variable is defined.
 """
 
 import os, signal, sys, time, imp, re, subprocess, glob, random, logging, shutil, math, unittest, random

Modified: qpid/trunk/qpid/cpp/src/tests/test_env.sh.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/test_env.sh.in?rev=1453970&r1=1453969&r2=1453970&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/test_env.sh.in (original)
+++ qpid/trunk/qpid/cpp/src/tests/test_env.sh.in Thu Mar  7 17:25:35 2013
@@ -67,6 +67,7 @@ exportmodule SSLCONNECTOR_LIB sslconnect
 exportmodule SSL_LIB ssl.so
 exportmodule WATCHDOG_LIB watchdog.so
 exportmodule XML_LIB xml.so
+exportmodule STORE_LIB legacystore.so
 
 # Qpid options
 export QPID_NO_MODULE_DIR=1	# Don't accidentally load installed modules



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org