param: Skip generating hooks for local and string parameters

[mat/samba.git] / selftest / selftest.pl

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index ffb61495a9ee16eeae069f61441f6770822a1307..b60b76228d04199a9b2e8c9cc042175bf8aed37a 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -692,6 +692,11 @@ my @exported_envvars = (
        "VAMPIRE_DC_NETBIOSNAME",
        "VAMPIRE_DC_NETBIOSALIAS",
 
+       "PROMOTED_DC_SERVER",
+       "PROMOTED_DC_SERVER_IP",
+       "PROMOTED_DC_NETBIOSNAME",
+       "PROMOTED_DC_NETBIOSALIAS",
+
        # server stuff
        "SERVER",
        "SERVER_IP",
@@ -714,8 +719,11 @@ my @exported_envvars = (
 
         # nss_wrapper
         "NSS_WRAPPER_PASSWD",
-        "NSS_WRAPPER_GROUP"
+        "NSS_WRAPPER_GROUP",
 
+        # UID/GID for rfc2307 mapping tests
+        "UID_RFC2307TEST",
+        "GID_RFC2307TEST"
 );
 
 $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub { 
@@ -839,20 +847,16 @@ if ($opt_testenv) {
 
        my $testenv_vars = setup_env($testenv_name, $prefix);
 
-       die("Unable to setup environment $testenv_name") unless ($testenv_vars);
+       if (not $testenv_vars or $testenv_vars eq "UNKNOWN") {
+               die("Unable to setup environment $testenv_name");
+       }
 
        $ENV{PIDDIR} = $testenv_vars->{PIDDIR};
        $ENV{ENVNAME} = $testenv_name;
 
        my $envvarstr = exported_envvars_str($testenv_vars);
 
-       my @term = ();
-       if ($ENV{TERMINAL}) {
-           @term = ($ENV{TERMINAL});
-       } else {
-           @term = ("xterm", "-e");
-       }
-       my @term_args = ("bash", "-c", "echo -e \"
+       my @term_args = ("echo -e \"
 Welcome to the Samba4 Test environment '$testenv_name'
 
 This matches the client environment used in make test
@@ -864,6 +868,13 @@ SMB_CONF_PATH=\$SMB_CONF_PATH
 
 $envvarstr
 \" && LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash");
+       my @term = ();
+       if ($ENV{TERMINAL}) {
+           @term = ($ENV{TERMINAL});
+       } else {
+           @term = ("xterm", "-e");
+           unshift(@term_args, ("bash", "-c"));
+       }
 
        system(@term, @term_args);
 
@@ -886,7 +897,7 @@ $envvarstr
                if ($? == -1) {
                        die("Unable to run $cmd: $!");
                } elsif ($? & 127) {
-                       die(snprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127),  ($? & 128) ? 'with' : 'without'));
+                       die(sprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127),  ($? & 128) ? 'with' : 'without'));
                }
 
                my $exitcode = $? >> 8;