Fix 'make gdbtest-enb' and the GDB_PROVISION option.

(This used to be commit 79c4d8e2fabc9c33d978c064b9c01ca45e463ced)

diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 871c14898f2fb2a7e87088e1fdb5dcc5e9398905..5503a42cddf2df542627c7a0d1dd9f7438ef4ca7 100644 (file)
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -78,4 +78,4 @@ gdbtest-all:: everything
 
 gdbtest-env:: everything
        SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
-       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS)--socket-wrapper --testenv
+       $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv

diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 6283a3799a3be55a971053cbb0d1a1428469a406..2347dfc742b78622984d548e457180f44539dcdd 100644 (file)
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -703,7 +703,7 @@ nogroup:x:65534:nobody
        push (@provision_options, "NSS_WRAPPER_PASSWD=\"$nsswrap_passwd\"");
        push (@provision_options, "NSS_WRAPPER_GROUP=\"$nsswrap_group\"");
        if (defined($ENV{GDB_PROVISION})) {
-               push (@provision_options, "gdb --args");
+               push (@provision_options, "gdb --args python");
        }
        if (defined($ENV{VALGRIND_PROVISION})) {
                push (@provision_options, "valgrind");