[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  61455ad selftest: Make --include-env and --exclude-env use the base env name
      from  312947f ctdb-tests: Add event script startup/shutdown tests

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 61455ad82e293df4a094204fdf28162baad686ae
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Jul 21 20:10:43 2017 +1200

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

-----------------------------------------------------------------------

Summary of changes:
 selftest/selftest.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 38de96d..b3ef658 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;
 			}
 		    }


-- 
Samba Shared Repository