s4-selftest Fix valgrind and gdb options for top level build

Andrew Bartlett

diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index a348345dfd25cee7161a34d83ff58a449c16032c..d2a9bc5ee860bcb2f3dac6f84072d344f1f31184 100644 (file)
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -134,13 +134,13 @@ def cmd_testonly(opt):
         server_wrapper = '${srcdir}/selftest/gdb_run _DUMMY=X'
 
     if Options.options.SCREEN:
-        server_wrapper = '${srcdir}selftest/in_screen %s' % server_wrapper
+        server_wrapper = '${srcdir}/selftest/in_screen %s' % server_wrapper
         os.environ['TERMINAL'] = '${srcdir}/selftest/in_screen'
     elif server_wrapper != '':
         server_wrapper = 'xterm -n server -l -e %s' % server_wrapper
 
     if server_wrapper != '':
-        os.environ['SAMBA_VALGRIND'] = server_wrapper
+        os.environ['SAMBA_VALGRIND'] = EXPAND_VARIABLES(opt, server_wrapper)
 
     # this is needed for systems without rpath, or with rpath disabled
     ADD_LD_LIBRARY_PATH('bin/shared')