summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-26 03:39:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:50 -0500
commitde85d70a4aa782bc9a693e72d36897a0b22e521a (patch)
tree7c503ee46abfdf18a955d94fda94f5b5d8d9f3b5
parent3214f2e2129eaa693658185c4ebebf1760a039ac (diff)
downloadsamba-de85d70a4aa782bc9a693e72d36897a0b22e521a.tar.gz
samba-de85d70a4aa782bc9a693e72d36897a0b22e521a.tar.bz2
samba-de85d70a4aa782bc9a693e72d36897a0b22e521a.zip
r7919: use more portable shell syntax for MALLOC_CHECK_
(This used to be commit 694882ffa62ae88e43e78e8e496720575630e523)
-rw-r--r--source4/script/tests/test_functions.sh6
-rwxr-xr-xsource4/script/tests/test_local.sh4
-rwxr-xr-xsource4/script/tests/test_posix.sh4
-rwxr-xr-xsource4/script/tests/test_rpc.sh4
-rwxr-xr-xsource4/script/tests/test_w2k3.sh4
5 files changed, 6 insertions, 16 deletions
diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh
index d435f2b8a8..2ddf1edb8f 100644
--- a/source4/script/tests/test_functions.sh
+++ b/source4/script/tests/test_functions.sh
@@ -164,3 +164,9 @@ teststatus() {
fi
exit $failed
}
+
+if [ -z "$VALGRIND" ]; then
+ MALLOC_CHECK_=2
+ export MALLOC_CHECK_
+fi
+
diff --git a/source4/script/tests/test_local.sh b/source4/script/tests/test_local.sh
index b50ec58e0b..bd85e8a9de 100755
--- a/source4/script/tests/test_local.sh
+++ b/source4/script/tests/test_local.sh
@@ -9,10 +9,6 @@ EOF
exit 1;
fi
-if [ -z "$VALGRIND" ]; then
- export MALLOC_CHECK_=2
-fi
-
incdir=`dirname $0`
. $incdir/test_functions.sh
diff --git a/source4/script/tests/test_posix.sh b/source4/script/tests/test_posix.sh
index 68fb59350e..b1ab8feb98 100755
--- a/source4/script/tests/test_posix.sh
+++ b/source4/script/tests/test_posix.sh
@@ -10,10 +10,6 @@ EOF
exit 1;
fi
-if [ -z "$VALGRIND" ]; then
- export MALLOC_CHECK_=2
-fi
-
unc="$1"
username="$2"
password="$3"
diff --git a/source4/script/tests/test_rpc.sh b/source4/script/tests/test_rpc.sh
index e2cf7c8c03..e5fc726a4b 100755
--- a/source4/script/tests/test_rpc.sh
+++ b/source4/script/tests/test_rpc.sh
@@ -16,10 +16,6 @@ EOF
exit 1;
fi
-if [ -z "$VALGRIND" ]; then
- export MALLOC_CHECK_=2
-fi
-
server="$1"
username="$2"
password="$3"
diff --git a/source4/script/tests/test_w2k3.sh b/source4/script/tests/test_w2k3.sh
index 71c6f3a4f7..3e7da590c0 100755
--- a/source4/script/tests/test_w2k3.sh
+++ b/source4/script/tests/test_w2k3.sh
@@ -14,10 +14,6 @@ EOF
exit 1;
fi
-if [ -z "$VALGRIND" ]; then
- export MALLOC_CHECK_=2
-fi
-
server="$1"
username="$2"
password="$3"