[telepathy-mission-control/master] exec-with-log.sh.in: be compatible with non-bash shells

Simon McVittie simon.mcvittie at collabora.co.uk
Thu May 14 09:12:23 PDT 2009


---
 test/twisted/tools/exec-with-log.sh.in |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/twisted/tools/exec-with-log.sh.in b/test/twisted/tools/exec-with-log.sh.in
index a416b25..c8a6c61 100644
--- a/test/twisted/tools/exec-with-log.sh.in
+++ b/test/twisted/tools/exec-with-log.sh.in
@@ -6,8 +6,10 @@ ulimit -c unlimited
 exec > missioncontrol-$$.log 2>&1
 
 if test -n "$MISSIONCONTROL_TEST_VALGRIND"; then
-	export G_DEBUG=gc-friendly
-	export G_SLICE=always-malloc
+        G_DEBUG="$G_DEBUG,gc-friendly"
+        export G_DEBUG
+        G_SLICE=always-malloc
+        export G_SLICE
 	MISSIONCONTROL_WRAPPER="valgrind --leak-check=full --num-callers=20"
 	MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --track-origins=yes"
 	MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER -v"
@@ -15,7 +17,8 @@ if test -n "$MISSIONCONTROL_TEST_VALGRIND"; then
 	MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --gen-suppressions=all"
 elif test -n "$MISSIONCONTROL_TEST_REFDBG"; then
         if test -z "$REFDBG_OPTIONS" ; then
-                export REFDBG_OPTIONS="btnum=10"
+                REFDBG_OPTIONS="btnum=10"
+                export REFDBG_OPTIONS
         fi
         if test -z "$MISSIONCONTROL_WRAPPER" ; then
                 MISSIONCONTROL_WRAPPER="refdbg"
-- 
1.5.6.5




More information about the telepathy-commits mailing list