s4/waf: Use TERMINAL env var or 'xterm' to start a terminal to debug in

diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index 5e42e6fb67c15e2d66cb1e04a05f69602fd0d4c9..baf224f84b82ad7ad6987ddfea2934cd3b2c2007 100644 (file)
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -103,11 +103,14 @@ def cmd_testonly(opt):
         if Options.options.VALGRINDLOG is not None:
             os.environ['VALGRIND'] += ' --log-file=%s' % Options.options.VALGRINDLOG
 
+    # use TERMINAL env var or 'xterm' by default
+    term = os.environ.get("TERMINAL") or 'xterm'
+
     if Options.options.VALGRIND_SERVER:
-        os.environ['SAMBA_VALGRIND'] = 'xterm -n server -e ../selftest/valgrind_run DUMMY=X'
+        os.environ['SAMBA_VALGRIND'] = '%s -n server -e ../selftest/valgrind_run DUMMY=X' % term
 
     if Options.options.GDBTEST:
-        os.environ['SAMBA_VALGRIND'] = 'xterm -n server -e ../selftest/gdb_run DUMMY=X'
+        os.environ['SAMBA_VALGRIND'] = '%s -n server -e ../selftest/gdb_run DUMMY=X' % term
 
     # this is needed for systems without rpath, or with rpath disabled
     ADD_LD_LIBRARY_PATH('bin/shared')