From cf92db755e657a000066b20ca548eef2b2b4fc95 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 21 Jul 2017 20:10:43 +1200 Subject: [PATCH] selftest: Make --include-env and --exclude-env use the base env name The code as deployed would have required (eg) '--include-env=ktest --include-env=ktest:local' which was not done in autobuild, causing tests to be skipped. This patch restores the intended behaviour. This causes 33 testsuites to run, one more test (the newly added samba.tests.ntlmauth) than the old regex provided (before 602772159dfd1213385f42ecbf31136f57693b63). (The regression dropped us down to matching only 7 tests). BUG: https://bugzilla.samba.org/show_bug.cgi?id=12922 Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Mon Jul 24 03:33:01 CEST 2017 on sn-devel-144 (cherry picked from commit 61455ad82e293df4a094204fdf28162baad686ae) --- selftest/selftest.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 38de96d6450..b3ef65828d7 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -1085,19 +1085,19 @@ $envvarstr my $cmd = $$_[2]; my $name = $$_[0]; my $envname = $$_[1]; - + my ($env_basename, $env_localpart) = split(/:/, $envname); my $envvars = "SKIP"; if (@opt_include_env) { foreach my $env (@opt_include_env) { - if ($envname eq $env) { + if ($env_basename eq $env) { $envvars = setup_env($envname, $prefix); } } } elsif (@opt_exclude_env) { my $excluded = 0; foreach my $env (@opt_exclude_env) { - if ($envname eq $env) { + if ($env_basename eq $env) { $excluded = 1; } } -- 2.11.0