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 <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Mon Jul 24 03:33:01 CEST 2017 on sn-devel-144

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 38de96d6450485ecbe1936eb3d60a6ea76a0ec5e..b3ef65828d7116dd3ed92c13be54a1ef1d258fa1 100755 (executable)
--- 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;
                        }
                    }