Author: kpvdr Date: 2009-07-10 10:33:54 -0400 (Fri, 10 Jul 2009) New Revision: 3483 Removed: store/trunk/cpp/tests/jrnl/_st_long_basic store/trunk/cpp/tests/jrnl/_st_long_read Modified: store/trunk/cpp/rhel4-support/rhel4.patch store/trunk/cpp/tests/jrnl/ Log: Removed two built files that were added in error, also fixed incorrect RHEL4 patch Modified: store/trunk/cpp/rhel4-support/rhel4.patch =================================================================== --- store/trunk/cpp/rhel4-support/rhel4.patch 2009-07-10 14:14:49 UTC (rev 3482) +++ store/trunk/cpp/rhel4-support/rhel4.patch 2009-07-10 14:33:54 UTC (rev 3483) @@ -2,7 +2,7 @@ =================================================================== --- tests/.valgrind.supp (revision 3413) +++ tests/.valgrind.supp (working copy) -@@ -1,32 +1,88 @@ +@@ -1,32 +1,74 @@ { - Benign error in libcpg. - Memcheck:Param Property changes on: store/trunk/cpp/tests/jrnl ___________________________________________________________________ Name: svn:ignore - .deps .libs Makefile Makefile.in jtest _ut_enq_map _ut_arr_cnt _ut_jdir _ut_jerrno _ut_jexception _ut_jinf _ut_long_lpmgr _ut_lpmgr _ut_rec_hdr _ut_time_ns _ut_txn_map _st_basic _st_basic_txn _st_read _st_read_txn _st_auto_expand .valgrind.supp .valgrindrc + .deps .libs Makefile Makefile.in jtest _ut_enq_map _ut_arr_cnt _ut_jdir _ut_jerrno _ut_jexception _ut_jinf _ut_long_lpmgr _ut_lpmgr _ut_rec_hdr _ut_time_ns _ut_txn_map _st_basic _st_basic_txn _st_long_basic _st_long_read _st_read _st_read_txn _st_auto_expand .valgrind.supp .valgrindrc Deleted: store/trunk/cpp/tests/jrnl/_st_long_basic =================================================================== --- store/trunk/cpp/tests/jrnl/_st_long_basic 2009-07-10 14:14:49 UTC (rev 3482) +++ store/trunk/cpp/tests/jrnl/_st_long_basic 2009-07-10 14:33:54 UTC (rev 3483) @@ -1,131 +0,0 @@ -#! /bin/sh - -# _st_long_basic - temporary wrapper script for .libs/_st_long_basic -# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18) -# -# The _st_long_basic program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='/bin/sed -e 1s/^X//' -sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' - -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command="(cd /home/kpvdr/mrg/store/tests/jrnl; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/lib64/qt-3.3/bin:/usr/kerberos/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/kpvdr/bin\"; export PATH; g++ -Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -pthread -DBOOST_TEST_DYN_LINK -g -O2 -o \$progdir/\$file _st_long_bas! ic-_st_basic.o _st_long_basic-unit_test.o -L/usr/lib/openais -L/usr/lib64/openais -L/usr/lib/corosync -L/usr/lib64/corosync -lboost_unit_test_framework ../../lib/.libs/msgstore.so -ldb_cxx-4.7 /home/kpvdr/mrg/qpid/cpp/src/.libs/libqpidbroker.so /home/kpvdr/mrg/qpid/cpp/src/.libs/libqpidcommon.so -lboost_program_options -lboost_filesystem -luuid -ldl -lsasl2 -lrt -laio -Wl,--rpath -Wl,/home/kpvdr/mrg/store/lib/.libs -Wl,--rpath -Wl,/home/kpvdr/mrg/qpid/cpp/src/.libs -Wl,--rpath -Wl,/usr/local/lib/qpid/daemon -Wl,--rpath -Wl,/usr/local/lib ) " - -# This environment variable determines our operation mode. -if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then - # install mode needs the following variable: - notinst_deplibs=' ../../lib/msgstore.la /home/kpvdr/mrg/qpid/cpp/src/libqpidbroker.la /home/kpvdr/mrg/qpid/cpp/src/libqpidcommon.la' -else - # When we are sourced in execute mode, $file and $echo are already set. - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - echo="echo" - file="$0" - # Make sure echo works. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : - else - # Restart under the correct shell, and then maybe $echo will work. - exec /bin/sh "$0" --no-reexec ${1+"$@"} - fi - fi - - # Find the directory that this script lives in. - thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "x$thisdir" = "x$file" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'` - while test -n "$file"; do - destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - - # If there was a directory component, then change thisdir. - if test "x$destdir" != "x$file"; then - case "$destdir" in - [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; - *) thisdir="$thisdir/$destdir" ;; - esac - fi - - file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'` - done - - # Try to get the absolute directory name. - absdir=`cd "$thisdir" && pwd` - test -n "$absdir" && thisdir="$absdir" - - program=lt-'_st_long_basic' - progdir="$thisdir/.libs" - - if test ! -f "$progdir/$program" || \ - { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \ - test "X$file" != "X$progdir/$program"; }; then - - file="$$-$program" - - if test ! -d "$progdir"; then - mkdir "$progdir" - else - rm -f "$progdir/$file" - fi - - # relink executable if necessary - if test -n "$relink_command"; then - if relink_command_output=`eval $relink_command 2>&1`; then : - else - echo "$relink_command_output" >&2 - rm -f "$progdir/$file" - exit 1 - fi - fi - - mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null || - { rm -f "$progdir/$program"; - mv -f "$progdir/$file" "$progdir/$program"; } - rm -f "$progdir/$file" - fi - - if test -f "$progdir/$program"; then - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - # Run the actual program with our arguments. - - exec "$progdir/$program" ${1+"$@"} - - $echo "$0: cannot exec $program $*" - exit 1 - fi - else - # The program doesn't exist. - $echo "$0: error: \`$progdir/$program' does not exist" 1>&2 - $echo "This script is just a wrapper for $program." 1>&2 - echo "See the libtool documentation for more information." 1>&2 - exit 1 - fi -fi Deleted: store/trunk/cpp/tests/jrnl/_st_long_read =================================================================== --- store/trunk/cpp/tests/jrnl/_st_long_read 2009-07-10 14:14:49 UTC (rev 3482) +++ store/trunk/cpp/tests/jrnl/_st_long_read 2009-07-10 14:33:54 UTC (rev 3483) @@ -1,131 +0,0 @@ -#! /bin/sh - -# _st_long_read - temporary wrapper script for .libs/_st_long_read -# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18) -# -# The _st_long_read program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='/bin/sed -e 1s/^X//' -sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' - -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command="(cd /home/kpvdr/mrg/store/tests/jrnl; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/lib64/qt-3.3/bin:/usr/kerberos/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/kpvdr/bin\"; export PATH; g++ -Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -pthread -DBOOST_TEST_DYN_LINK -g -O2 -o \$progdir/\$file _st_long_rea! d-_st_read.o _st_long_read-unit_test.o -L/usr/lib/openais -L/usr/lib64/openais -L/usr/lib/corosync -L/usr/lib64/corosync -lboost_unit_test_framework ../../lib/.libs/msgstore.so -ldb_cxx-4.7 /home/kpvdr/mrg/qpid/cpp/src/.libs/libqpidbroker.so /home/kpvdr/mrg/qpid/cpp/src/.libs/libqpidcommon.so -lboost_program_options -lboost_filesystem -luuid -ldl -lsasl2 -lrt -laio -Wl,--rpath -Wl,/home/kpvdr/mrg/store/lib/.libs -Wl,--rpath -Wl,/home/kpvdr/mrg/qpid/cpp/src/.libs -Wl,--rpath -Wl,/usr/local/lib/qpid/daemon -Wl,--rpath -Wl,/usr/local/lib ) " - -# This environment variable determines our operation mode. -if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then - # install mode needs the following variable: - notinst_deplibs=' ../../lib/msgstore.la /home/kpvdr/mrg/qpid/cpp/src/libqpidbroker.la /home/kpvdr/mrg/qpid/cpp/src/libqpidcommon.la' -else - # When we are sourced in execute mode, $file and $echo are already set. - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - echo="echo" - file="$0" - # Make sure echo works. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : - else - # Restart under the correct shell, and then maybe $echo will work. - exec /bin/sh "$0" --no-reexec ${1+"$@"} - fi - fi - - # Find the directory that this script lives in. - thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "x$thisdir" = "x$file" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'` - while test -n "$file"; do - destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - - # If there was a directory component, then change thisdir. - if test "x$destdir" != "x$file"; then - case "$destdir" in - [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; - *) thisdir="$thisdir/$destdir" ;; - esac - fi - - file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'` - done - - # Try to get the absolute directory name. - absdir=`cd "$thisdir" && pwd` - test -n "$absdir" && thisdir="$absdir" - - program=lt-'_st_long_read' - progdir="$thisdir/.libs" - - if test ! -f "$progdir/$program" || \ - { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \ - test "X$file" != "X$progdir/$program"; }; then - - file="$$-$program" - - if test ! -d "$progdir"; then - mkdir "$progdir" - else - rm -f "$progdir/$file" - fi - - # relink executable if necessary - if test -n "$relink_command"; then - if relink_command_output=`eval $relink_command 2>&1`; then : - else - echo "$relink_command_output" >&2 - rm -f "$progdir/$file" - exit 1 - fi - fi - - mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null || - { rm -f "$progdir/$program"; - mv -f "$progdir/$file" "$progdir/$program"; } - rm -f "$progdir/$file" - fi - - if test -f "$progdir/$program"; then - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - # Run the actual program with our arguments. - - exec "$progdir/$program" ${1+"$@"} - - $echo "$0: cannot exec $program $*" - exit 1 - fi - else - # The program doesn't exist. - $echo "$0: error: \`$progdir/$program' does not exist" 1>&2 - $echo "This script is just a wrapper for $program." 1>&2 - echo "See the libtool documentation for more information." 1>&2 - exit 1 - fi -fi