Author: kpvdr
Date: 2009-07-10 15:43:58 -0400 (Fri, 10 Jul 2009)
New Revision: 3485
Modified:
store/trunk/cpp/rhel4-support/rhel4.patch
store/trunk/cpp/tests/cluster/Makefile.am
store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp
Log:
Fixes to valgrind suppression file for 32-bit RHEL4, also fix for RHEL4 check-long make
error
Modified: store/trunk/cpp/rhel4-support/rhel4.patch
===================================================================
--- store/trunk/cpp/rhel4-support/rhel4.patch 2009-07-10 15:18:41 UTC (rev 3484)
+++ store/trunk/cpp/rhel4-support/rhel4.patch 2009-07-10 19:43:58 UTC (rev 3485)
@@ -1,6 +1,6 @@
Index: tests/.valgrind.supp
===================================================================
---- tests/.valgrind.supp (revision 3413)
+--- tests/.valgrind.supp (revision 3484)
+++ tests/.valgrind.supp (working copy)
@@ -1,32 +1,74 @@
{
@@ -11,9 +11,9 @@
- obj:*/libcpg.so.2.0.0
+ <insert a suppression name here>
+ Memcheck:Leak
-+ fun:_Znwm
-+ fun:_ZNSs4_Rep9_S_createEmmRKSaIcE
-+ obj:/usr/lib64/libstdc++.so.6.0.3
++ fun:_Znw?
++ fun:_ZNSs4_Rep9_S_createE??RKSaIcE
++ obj:*/libstdc++.so.6.0.3
+ fun:_ZNSsC1EPKcRKSaIcE
+
fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
+ fun:_ZN4qpid3log5posix11SinkOptionsC1ERKSs
@@ -60,7 +60,7 @@
- fun:epoll_ctl
+ <insert a suppression name here>
+ Memcheck:Leak
-+ fun:_Znwm
++ fun:_Znw?
+
fun:_ZNSt6vectorISsSaISsEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPSsS1_EERKSs
+ fun:_ZN4qpid7Options14register_namesESs
+
fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
@@ -90,7 +90,7 @@
+ Memcheck:Leak
+ fun:calloc
+ fun:_dl_allocate_tls
-+ fun:pthread_create@@GLIBC_2.2.5
++ fun:pthread_create@@GLIBC_2.*
+}
+{
+ <insert a suppression name here>
Modified: store/trunk/cpp/tests/cluster/Makefile.am
===================================================================
--- store/trunk/cpp/tests/cluster/Makefile.am 2009-07-10 15:18:41 UTC (rev 3484)
+++ store/trunk/cpp/tests/cluster/Makefile.am 2009-07-10 19:43:58 UTC (rev 3485)
@@ -25,7 +25,6 @@
if HAVE_LIBCPG
-
AM_CXXFLAGS = $(WARNING_CFLAGS) -pthread -DBOOST_TEST_DYN_LINK
INCLUDES=-I$(top_srcdir)/lib $(QPID_CXXFLAGS)
@@ -59,4 +58,9 @@
check-long:
$(MAKE) check TESTS="$(LONG_TESTS)" SUBDIRS=.
-endif
\ No newline at end of file
+else
+
+check-long:
+ @echo "Cluster tests skipped - HAVE_LIBCPG not defined."
+
+endif
Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2009-07-10 15:18:41 UTC (rev 3484)
+++ store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2009-07-10 19:43:58 UTC (rev 3485)
@@ -146,7 +146,7 @@
::srand48(seed);
const std::size_t num = 1024;
- cout << test_filename << ".xid_data_xid: seed=0x" <<
std::hex << seed << std::dec << flush;
+ cout << test_filename << ".xid_data_xid seed=0x" <<
std::hex << seed << std::dec << ": " << flush;
BOOST_CHECK_EQUAL(data_src::get_xid(1), "0");
BOOST_CHECK_EQUAL(data_src::get_xid(2), "01");
BOOST_CHECK_EQUAL(data_src::get_xid(3), "002");
Show replies by date