sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

selftest: Make --include-env and --exclude-env use the base env name

Browse Source 
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
602772159d).

(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
This commit is contained in:
Andrew Bartlett 2017-07-21 20:10:43 +12:00 committed by Stefan Metzmacher
parent 312947f89b
commit 61455ad82e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
selftest/selftest.pl
View File

@ -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;
}
}