From 9a332b4febfc55341da8f06460baba8ecbb021dd Mon Sep 17 00:00:00 2001 From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Date: Wed, 18 Sep 2024 13:38:52 +1200 Subject: [PATCH] selftest:S4: do not add 'env python' multiple times' While we have no sane reason to use VALGRIND_PROVISION=1 GDB_PROVISION=1 make test... we will soon gain PY_DEV_PROVISION, which could be useful in tandem with valgrind, rr, or gdb, and this will allow that. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andreas Schneider <asn@samba.org> --- selftest/target/Samba4.pm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 923cc744e35..2ef94e0c829 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -672,18 +672,17 @@ sub provision_raw_prepare($$$$$$$$$$$$$$) push (@provision_options, "OPENSSL_FORCE_FIPS_MODE=1"); } - if (defined($ENV{GDB_PROVISION})) { - push (@provision_options, "gdb --args"); - if (!defined($ENV{PYTHON})) { - push (@provision_options, "env"); - push (@provision_options, "python"); + if (defined($ENV{GDB_PROVISION}) || + defined($ENV{VALGRIND_PROVISION})) { + if (defined($ENV{GDB_PROVISION})) { + push (@provision_options, "gdb --args"); + } + if (defined($ENV{VALGRIND_PROVISION})) { + push (@provision_options, "valgrind"); } - } - if (defined($ENV{VALGRIND_PROVISION})) { - push (@provision_options, "valgrind"); if (!defined($ENV{PYTHON})) { - push (@provision_options, "env"); - push (@provision_options, "python"); + push (@provision_options, "env"); + push (@provision_options, "python"); } }