selftest: move warning about invalid environments up to selftest.pl

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 1c8436bb04d317a485c5df7bd282a4507372be90..aa22a57c796d89669e798d11fb9b53455b6c40b9 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -878,10 +878,14 @@ sub setup_env($$)
        } else {
                $testenv_vars = $target->setup_env($envname, $prefix);
                if (defined($testenv_vars) && not defined($testenv_vars->{target})) {
-                      $testenv_vars->{target} = $target;
+                       $testenv_vars->{target} = $target;
+               }
+               if (not defined($testenv_vars)) {
+                       warn("$opt_target can't provide environment '$envname'");
                }
        }
 
+       
        return undef unless defined($testenv_vars);
 
        $running_envs{$envname} = $testenv_vars;

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index dd7daf736d5ed99a6cfb54fb0066aa17040656d5..602a134982ef1e7ee3e01fb89b510a3f4af83085 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1352,7 +1352,6 @@ sub setup_env($$$)
                }
                return $ret;
        } else {
-               warn("Samba4 can't provide environment '$envname'");
                return undef;
        }
 }