[Telepathy-commits] [telepathy-gabble/master] Tests: refdbg: fix README and let the user use a different refdbg

[Alban Crequy]

---
 tests/README                            |    9 ++++++---
 tests/twisted/tools/exec-with-log.sh.in |    8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/README b/tests/README
index fe3b249..a7723eb 100644
--- a/tests/README
+++ b/tests/README
@@ -51,11 +51,14 @@ To debug an individual test you can set one of the following env variable:
 
   * GABBLE_TEST_VALGRIND : to run Gabble inside valgrind. The report is
     added to tools/gabble-testing.log.
+        export GABBLE_TEST_VALGRIND=1
 
   * GABBLE_TEST_REFDBG : to run Gabble inside refdbg. The report is written
-    to tools/refdbg.log. You also need to setup GABBLE_WRAPPER to your refdbg
-    command. Example:
-        export GABBLE_WRAPPER="~/bin/refdbg -c btnum=16"
+    to tools/refdbg.log. You can change GABBLE_WRAPPER to use an alternative
+    refdbg and change REFDBG_OPTIONS to set your own parameters. Example:
+        export GABBLE_TEST_REFDBG=1
+        export GABBLE_WRAPPER="/path/to/refdbg"
+        export REFDBG_OPTIONS="btnum=16"
 
   * GABBLE_WRAPPER="nemiver" : to run Gabble inside the graphical debugger
     nemiver. You'll be able to set up breakpoints; then hit the "continue"
diff --git a/tests/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in
index a94810c..7525e16 100644
--- a/tests/twisted/tools/exec-with-log.sh.in
+++ b/tests/twisted/tools/exec-with-log.sh.in
@@ -15,8 +15,12 @@ if test -n "$GABBLE_TEST_VALGRIND"; then
         GABBLE_WRAPPER="$GABBLE_WRAPPER --child-silent-after-fork=yes"
         GABBLE_WRAPPER="$GABBLE_WRAPPER --suppressions=@abs_top_srcdir@/tests/twisted/tools/tp-glib.supp"
 elif test -n "$GABBLE_TEST_REFDBG"; then
-        export REFDBG_OPTIONS="btnum=10"
-        GABBLE_WRAPPER="refdbg"
+        if test -z "$REFDBG_OPTIONS" ; then
+                export REFDBG_OPTIONS="btnum=10"
+        fi
+        if test -z "$GABBLE_WRAPPER" ; then
+                GABBLE_WRAPPER="refdbg"
+        fi
 fi
 
 exec @abs_top_builddir@/libtool --mode=execute $GABBLE_WRAPPER ../telepathy-gabble-debug
-- 
1.5.6.5