From: Peter Stamfest <peter@stamfest.at>
Date: Tue, 2 Sep 2014 21:55:27 +0000 (+0200)
Subject: fixup implement new test style
X-Git-Tag: v1.5.0-rc1~42^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=129548db6831c304b43102fba2640a9c4177d9ac;p=thirdparty%2Frrdtool-1.x.git

fixup implement new test style
---

diff --git a/tests/functions b/tests/functions
index 3cfed51c..bea24d0d 100644
--- a/tests/functions
+++ b/tests/functions
@@ -12,9 +12,11 @@ TOP_BUILDDIR="${TOP_BUILDDIR:-${BASEDIR}/..}"
 # https://stackoverflow.com/questions/4254610/valgrind-reports-memory-possibly-lost-when-using-glib-data-types)
 # we set some env. vars to work around them:
 
-function rrdtool_valgrind {
+function valgrind {
   # use a sub shell, so setting environment variables only affects the current
   # rrdtool run and not subsequent ones
+  local CMD="$1"
+  shift
   (
     G_DEBUG=gc-friendly
     G_SLICE=all
@@ -37,7 +39,7 @@ function rrdtool_valgrind {
                         --track-origins=yes \
 			--free-fill=ad \
                         $VALGRIND_OPTS \
-			"$TOP_BUILDDIR/src/rrdtool" "$@"
+			"$CMD" "$@"
     RC=$?
 
     if [ -n "$VALGRIND_LOGFILE" ] ; then
@@ -60,16 +62,19 @@ if [ -z "$RRDTOOL" ] ; then
 	case "$TESTS_STYLE" in
 	valgrind)
 		echo >&2 "# Note: exit code 111 indicates a valgrind detected memory problem" 
-		RRDTOOL=rrdtool_valgrind
+		RRDTOOL="valgrind $TOP_BUILDDIR/src/rrdtool"
+		RRDCACHED="valgrind $TOP_BUILDDIR/src/rrdcached"
                 ;;
 	valgrind-logfile)
 		echo >&2 "# Note: exit code 111 indicates a valgrind detected memory problem" 
-		RRDTOOL=rrdtool_valgrind
+		RRDTOOL="valgrind $TOP_BUILDDIR/src/rrdtool"
+		RRDCACHED="valgrind $TOP_BUILDDIR/src/rrdcached"
                 VALGRIND_LOGFILE="${BASEDIR}/$(basename $0)"-valgrind.log
                 rm -f "$VALGRIND_LOGFILE"
 	;;
 	*)
 		RRDTOOL=$TOP_BUILDDIR/src/rrdtool
+		RRDCACHED=$TOP_BUILDDIR/src/rrdcached
 		;;
 	esac
 fi