docs: fix a typo in history file
[bbaumbach/samba-autobuild/.git] / selftest / selftest.pl
index 12452bc420d320a7be82be37df941d1aacb91f17..99ec813af7c8746593eda115ecd43032811b3a0c 100755 (executable)
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
+use warnings;
 
 use FindBin qw($RealBin $Script);
 use File::Spec;
 use File::Temp qw(tempfile);
+use File::Path qw(remove_tree);
 use Getopt::Long;
 use POSIX;
 use Cwd qw(abs_path);
@@ -28,6 +30,7 @@ use lib "$RealBin";
 use Subunit;
 use SocketWrapper;
 use target::Samba;
+use Time::HiRes qw(time);
 
 eval {
 require Time::HiRes;
@@ -52,13 +55,15 @@ my @opt_include_env = ();
 my $opt_testenv = 0;
 my $opt_list = 0;
 my $opt_mitkrb5 = 0;
-my $ldap = undef;
+my $opt_default_ldb_backend = "mdb";
 my $opt_resetup_env = undef;
 my $opt_load_list = undef;
 my $opt_libnss_wrapper_so_path = "";
 my $opt_libresolv_wrapper_so_path = "";
 my $opt_libsocket_wrapper_so_path = "";
 my $opt_libuid_wrapper_so_path = "";
+my $opt_libasan_so_path = "";
+my $opt_libcrypt_so_path = "";
 my $opt_use_dns_faking = 0;
 my @testlists = ();
 
@@ -103,35 +108,6 @@ sub skip
 
 sub getlog_env($);
 
-sub setup_pcap($)
-{
-       my ($name) = @_;
-
-       return unless ($opt_socket_wrapper_pcap);
-       return unless defined($ENV{SOCKET_WRAPPER_PCAP_DIR});
-
-       my $fname = $name;
-       $fname =~ s%[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-]%_%g;
-
-       my $pcap_file = "$ENV{SOCKET_WRAPPER_PCAP_DIR}/$fname.pcap";
-
-       SocketWrapper::setup_pcap($pcap_file);
-
-       return $pcap_file;
-}
-
-sub cleanup_pcap($$)
-{
-       my ($pcap_file, $exitcode) = @_;
-
-       return unless ($opt_socket_wrapper_pcap);
-       return if ($opt_socket_wrapper_keep_pcap);
-       return unless ($exitcode == 0);
-       return unless defined($pcap_file);
-
-       unlink($pcap_file);
-}
-
 # expand strings from %ENV
 sub expand_environment_strings($)
 {
@@ -143,16 +119,22 @@ sub expand_environment_strings($)
        return $s;
 }
 
+my $target;
+
 sub run_testsuite($$$$$)
 {
        my ($envname, $name, $cmd, $i, $totalsuites) = @_;
-       my $pcap_file = setup_pcap($name);
+       my $pcap_file = $target->setup_pcap($name);
 
        Subunit::start_testsuite($name);
        Subunit::progress_push();
-       Subunit::report_time(time());
-       system($cmd);
-       Subunit::report_time(time());
+       Subunit::report_time();
+       # Enable pipefail so that we catch failing testsuites that are part of a
+       # pipeline (typically, piped through filter-subunit). This won't catch
+       # any testsuite failures that are turned into testsuite-xfails by
+       # filter-subunit.
+       system("bash", "-o", "pipefail", "-c", $cmd);
+       Subunit::report_time();
        Subunit::progress_pop();
 
        if ($? == -1) {
@@ -184,7 +166,7 @@ sub run_testsuite($$$$$)
                Subunit::end_testsuite($name, "failure", "Exit code was $exitcode");
        }
 
-       cleanup_pcap($pcap_file, $exitcode);
+       $target->cleanup_pcap($pcap_file, $exitcode);
 
        if (not $opt_socket_wrapper_keep_pcap and defined($pcap_file)) {
                print "PCAP FILE: $pcap_file\n";
@@ -224,6 +206,7 @@ Preload cwrap:
  --resolv_wrapper_so_path=FILE the resolv_wrapper library to preload
  --socket_wrapper_so_path=FILE the socket_wrapper library to preload
  --uid_wrapper_so_path=FILE the uid_wrapper library to preload
+ --asan_so_path=FILE the asan library to preload
 
 DNS:
   --use-dns-faking          Fake DNS entries rather than talking to our
@@ -231,13 +214,10 @@ DNS:
 
 Target Specific:
  --socket-wrapper-pcap      save traffic to pcap directories
- --socket-wrapper-keep-pcap keep all pcap files, not just those for tests that 
+ --socket-wrapper-keep-pcap keep all pcap files, not just those for tests that
                             failed
  --socket-wrapper           enable socket wrapper
 
-Samba4 Specific:
- --ldap=openldap|fedora-ds  back samba onto specified ldap server
-
 Behaviour:
  --quick                    run quick overall test
  --one                      abort when the first test fails
@@ -265,7 +245,7 @@ my $result = GetOptions (
                'testenv' => \$opt_testenv,
                'list' => \$opt_list,
                'mitkrb5' => \$opt_mitkrb5,
-               'ldap:s' => \$ldap,
+               'default-ldb-backend=s' => \$opt_default_ldb_backend,
                'resetup-environment' => \$opt_resetup_env,
                'testlist=s' => \@testlists,
                'random-order' => \$opt_random_order,
@@ -274,6 +254,8 @@ my $result = GetOptions (
                'resolv_wrapper_so_path=s' => \$opt_libresolv_wrapper_so_path,
                'socket_wrapper_so_path=s' => \$opt_libsocket_wrapper_so_path,
                'uid_wrapper_so_path=s' => \$opt_libuid_wrapper_so_path,
+               'asan_so_path=s' => \$opt_libasan_so_path,
+               'crypt_so_path=s' => \$opt_libcrypt_so_path,
                'use-dns-faking' => \$opt_use_dns_faking
            );
 
@@ -297,25 +279,19 @@ unless (defined($ENV{VALGRIND})) {
 # make all our python scripts unbuffered
 $ENV{PYTHONUNBUFFERED} = 1;
 
-my $bindir_abs = abs_path($bindir);
+$ENV{SAMBA_DEPRECATED_SUPPRESS} = 1;
 
-# Backwards compatibility:
-if (defined($ENV{TEST_LDAP}) and $ENV{TEST_LDAP} eq "yes") {
-       if (defined($ENV{FEDORA_DS_ROOT})) {
-               $ldap = "fedora-ds";
-       } else {
-               $ldap = "openldap";
-       }
-}
+# do not depend on the users setup
+# see also bootstrap/config.py
+$ENV{TZ} = "UTC";
+$ENV{LC_ALL} = $ENV{LANG} = "en_US.utf8";
+
+my $bindir_abs = abs_path($bindir);
 
 my $torture_maxtime = ($ENV{TORTURE_MAXTIME} or 1200);
-if ($ldap) {
-       # LDAP is slow
-       $torture_maxtime *= 2;
-}
 
 $prefix =~ s+//+/+;
-$prefix =~ s+/./+/+;
+$prefix =~ s+/\./+/+;
 $prefix =~ s+/$++;
 
 die("using an empty prefix isn't allowed") unless $prefix ne "";
@@ -347,7 +323,6 @@ $ENV{PREFIX} = $prefix;
 $ENV{PREFIX_ABS} = $prefix_abs;
 $ENV{SRCDIR} = $srcdir;
 $ENV{SRCDIR_ABS} = $srcdir_abs;
-$ENV{GNUPGHOME} = "$srcdir_abs/selftest/gnupg";
 $ENV{BINDIR} = $bindir_abs;
 
 my $tls_enabled = not $opt_quick;
@@ -377,6 +352,22 @@ if ($opt_socket_wrapper_pcap) {
 
 my $ld_preload = $ENV{LD_PRELOAD};
 
+if ($opt_libasan_so_path) {
+       if ($ld_preload) {
+               if ($opt_libcrypt_so_path) {
+                       $ld_preload = "$opt_libasan_so_path:$opt_libcrypt_so_path:$ld_preload";
+               } else {
+                       $ld_preload = "$opt_libasan_so_path:$ld_preload";
+               }
+       } else {
+               if ($opt_libcrypt_so_path) {
+                       $ld_preload = "$opt_libasan_so_path:$opt_libcrypt_so_path";
+               } else {
+                       $ld_preload = "$opt_libasan_so_path";
+               }
+       }
+}
+
 if ($opt_libnss_wrapper_so_path) {
        if ($ld_preload) {
                $ld_preload = "$ld_preload:$opt_libnss_wrapper_so_path";
@@ -409,12 +400,25 @@ if ($opt_libuid_wrapper_so_path) {
        }
 }
 
+if (defined($ENV{USE_NAMESPACES})) {
+       print "Using linux containerization for selftest testenv(s)...\n";
+
+       # Create a common bridge to connect up the testenv namespaces. We give
+       # it the client's IP address, as this is where the tests will run from
+       my $ipv4_addr = Samba::get_ipv4_addr("client");
+       my $ipv6_addr = Samba::get_ipv6_addr("client");
+       system "$ENV{SRCDIR_ABS}/selftest/ns/create_bridge.sh selftest0 $ipv4_addr $ipv6_addr";
+}
+
 $ENV{LD_PRELOAD} = $ld_preload;
 print "LD_PRELOAD=$ENV{LD_PRELOAD}\n";
 
 # Enable uid_wrapper globally
 $ENV{UID_WRAPPER} = 1;
 
+# We are already hitting the limit, so double it.
+$ENV{NSS_WRAPPER_MAX_HOSTENTS} = 200;
+
 # Disable RTLD_DEEPBIND hack for Samba bind dlz module
 #
 # This is needed in order to allow the ldb_*ldap module
@@ -436,11 +440,11 @@ if ($opt_use_dns_faking) {
        $ENV{SAMBA_DNS_FAKING} = 1;
 }
 
-my $target;
 my $testenv_default = "none";
 
 if ($opt_mitkrb5 == 1) {
        $ENV{MITKRB5} = $opt_mitkrb5;
+       $ENV{KRB5RCACHETYPE} = "none";
 }
 
 # After this many seconds, the server will self-terminate.  All tests
@@ -460,7 +464,10 @@ if (defined($ENV{SMBD_MAXTIME}) and $ENV{SMBD_MAXTIME} ne "") {
     $server_maxtime = $ENV{SMBD_MAXTIME};
 }
 
-$target = new Samba($bindir, $ldap, $srcdir, $server_maxtime);
+$target = new Samba($bindir, $srcdir, $server_maxtime,
+                   $opt_socket_wrapper_pcap,
+                   $opt_socket_wrapper_keep_pcap,
+                   $opt_default_ldb_backend);
 unless ($opt_list) {
        if ($opt_target eq "samba") {
                $testenv_default = "ad_dc";
@@ -474,14 +481,14 @@ sub read_test_regexes($)
        my ($name) = @_;
        my @ret = ();
        open(LF, "<$name") or die("unable to read $name: $!");
-       while (<LF>) { 
-               chomp; 
+       while (<LF>) {
+               chomp;
                next if (/^#/);
                if (/^(.*?)([ \t]+)\#([\t ]*)(.*?)$/) {
                        push (@ret, [$1, $4]);
                } else {
                        s/^(.*?)([ \t]+)\#([\t ]*)(.*?)$//;
-                       push (@ret, [$_, undef]); 
+                       push (@ret, [$_, undef]);
                }
        }
        close(LF);
@@ -496,12 +503,11 @@ foreach (@opt_include) {
        push (@includes, read_test_regexes($_));
 }
 
-my $interfaces = join(',', ("127.0.0.11/8",
-                           "127.0.0.12/8",
-                           "127.0.0.13/8",
-                           "127.0.0.14/8",
-                           "127.0.0.15/8",
-                           "127.0.0.16/8"));
+# We give the selftest client 6 different IPv4 addresses to use. Most tests
+# only use the first (.11) IP. Note that winsreplication.c is one test that
+# uses the other IPs (search for iface_list_count()).
+$ENV{SOCKET_WRAPPER_IPV4_NETWORK} = "10.53.57.0";
+my $interfaces = Samba::get_interfaces_config("client", 6);
 
 my $clientdir = "$prefix_abs/client";
 
@@ -514,61 +520,34 @@ sub write_clientconf($$$)
 
        mkdir("$clientdir", 0777) unless -d "$clientdir";
 
-       if ( -d "$clientdir/private" ) {
-               unlink <$clientdir/private/*>;
-       } else {
-               mkdir("$clientdir/private", 0777);
-       }
-
-       if ( -d "$clientdir/bind-dns" ) {
-               unlink <$clientdir/bind-dns/*>;
-       } else {
-               mkdir("$clientdir/bind-dns", 0777);
-       }
-
-       if ( -d "$clientdir/lockdir" ) {
-               unlink <$clientdir/lockdir/*>;
-       } else {
-               mkdir("$clientdir/lockdir", 0777);
-       }
-
-       if ( -d "$clientdir/statedir" ) {
-               unlink <$clientdir/statedir/*>;
-       } else {
-               mkdir("$clientdir/statedir", 0777);
-       }
-
-       if ( -d "$clientdir/cachedir" ) {
-               unlink <$clientdir/cachedir/*>;
-       } else {
-               mkdir("$clientdir/cachedir", 0777);
-       }
-
-       # this is ugly, but the ncalrpcdir needs exactly 0755
-       # otherwise tests fail.
-       my $mask = umask;
-       umask 0022;
-       if ( -d "$clientdir/ncalrpcdir/np" ) {
-               unlink <$clientdir/ncalrpcdir/np/*>;
-               rmdir "$clientdir/ncalrpcdir/np";
-       }
-       if ( -d "$clientdir/ncalrpcdir" ) {
-               unlink <$clientdir/ncalrpcdir/*>;
-               rmdir "$clientdir/ncalrpcdir";
+       my @subdirs = (
+               { name => "private", mask => 0777 },
+               { name => "bind-dns", mask => 0777 },
+               { name => "lockdir", mask => 0777 },
+               { name => "statedir", mask => 0777 },
+               { name => "cachedir", mask => 0777 },
+               { name => "pkinit", mask => 0700 },
+               { name => "pid", mask => 0777 },
+               # the ncalrpcdir needs exactly 0755 otherwise tests fail.
+               { name => "ncalrpcdir", mask => 0755, umask => 0022 },
+       );
+
+       foreach my $sub (@subdirs) {
+               my $dir = "$clientdir/$sub->{name}";
+               remove_tree($dir);
+               my $mask = umask;
+               if (defined($sub->{umask})) {
+                       umask $sub->{umask};
+               }
+               mkdir($dir, $sub->{mask});
+               umask $mask;
        }
-       mkdir("$clientdir/ncalrpcdir", 0755);
-       umask $mask;
 
        my $cadir = "$ENV{SRCDIR_ABS}/selftest/manage-ca/CA-samba.example.com";
        my $cacert = "$cadir/Public/CA-samba.example.com-cert.pem";
        my $cacrl_pem = "$cadir/Public/CA-samba.example.com-crl.pem";
        my $ca_users_dir = "$cadir/Users";
-
-       if ( -d "$clientdir/pkinit" ) {
-               unlink <$clientdir/pkinit/*>;
-       } else {
-               mkdir("$clientdir/pkinit", 0700);
-       }
+       my $client_loglevel = $ENV{CLIENT_LOG_LEVEL} || 1;
 
        # each user has a USER-${USER_PRINCIPAL_NAME}-cert.pem and
        # USER-${USER_PRINCIPAL_NAME}-private-key.pem symlink
@@ -614,16 +593,16 @@ sub write_clientconf($$$)
        state directory = $clientdir/statedir
        cache directory = $clientdir/cachedir
        ncalrpc dir = $clientdir/ncalrpcdir
+       pid directory = $clientdir/pid
        panic action = $RealBin/gdb_backtrace \%d
        max xmit = 32K
        notify:inotify = false
        ldb:nosync = true
        system:anonymous = true
        client lanman auth = Yes
-       log level = 1
+       client min protocol = CORE
+       log level = $client_loglevel
        torture:basedir = $clientdir
-#We don't want to pass our self-tests if the PAC code is wrong
-       gensec:require_pac = true
 #We don't want to run 'speed' tests for very long
         torture:timelimit = 1
         winbind separator = /
@@ -631,6 +610,7 @@ sub write_clientconf($$$)
        tls crlfile = ${cacrl_pem}
        tls verify peer = no_check
        include system krb5 conf = no
+       elasticsearch:mappings = $srcdir_abs/source3/rpc_server/mdssvc/elasticsearch_mappings.json
 ";
        close(CF);
 }
@@ -691,11 +671,6 @@ $ENV{SELFTEST_PREFIX} = "$prefix_abs";
 $ENV{SELFTEST_TMPDIR} = "$tmpdir_abs";
 $ENV{TMPDIR} = "$tmpdir_abs";
 $ENV{TEST_DATA_PREFIX} = "$tmpdir_abs";
-if ($opt_socket_wrapper) {
-       $ENV{SELFTEST_INTERFACES} = $interfaces;
-} else {
-       $ENV{SELFTEST_INTERFACES} = "";
-}
 if ($opt_quick) {
        $ENV{SELFTEST_QUICK} = "1";
 } else {
@@ -703,9 +678,15 @@ if ($opt_quick) {
 }
 $ENV{SELFTEST_MAXTIME} = $torture_maxtime;
 
+my $selftest_resolv_conf_path = "$tmpdir_abs/selftest.resolv.conf";
+$ENV{RESOLV_CONF} = "${selftest_resolv_conf_path}.global";
+
 my $selftest_krbt_ccache_path = "$tmpdir_abs/selftest.krb5_ccache";
 $ENV{KRB5CCNAME} = "FILE:${selftest_krbt_ccache_path}.global";
 
+my $selftest_gnupghome_path = "$tmpdir_abs/selftest.no.gnupg";
+$ENV{GNUPGHOME} = "${selftest_gnupghome_path}.global";
+
 my @available = ();
 foreach my $fn (@testlists) {
        foreach (read_testlist($fn)) {
@@ -781,7 +762,7 @@ my $suitestotal = $#todo + 1;
 
 unless ($opt_list) {
        Subunit::progress($suitestotal);
-       Subunit::report_time(time());
+       Subunit::report_time();
 }
 
 my $i = 0;
@@ -800,112 +781,6 @@ sub get_running_env($)
        return $running_envs{$envname};
 }
 
-my @exported_envvars = (
-       # domain stuff
-       "DOMAIN",
-       "REALM",
-
-       # stuff related to a trusted domain
-       "TRUST_SERVER",
-       "TRUST_SERVER_IP",
-       "TRUST_SERVER_IPV6",
-       "TRUST_NETBIOSNAME",
-       "TRUST_USERNAME",
-       "TRUST_PASSWORD",
-       "TRUST_DOMAIN",
-       "TRUST_REALM",
-
-       # domain controller stuff
-       "DC_SERVER",
-       "DC_SERVER_IP",
-       "DC_SERVER_IPV6",
-       "DC_NETBIOSNAME",
-       "DC_NETBIOSALIAS",
-
-       # domain member
-       "MEMBER_SERVER",
-       "MEMBER_SERVER_IP",
-       "MEMBER_SERVER_IPV6",
-       "MEMBER_NETBIOSNAME",
-       "MEMBER_NETBIOSALIAS",
-
-       # rpc proxy controller stuff
-       "RPC_PROXY_SERVER",
-       "RPC_PROXY_SERVER_IP",
-       "RPC_PROXY_SERVER_IPV6",
-       "RPC_PROXY_NETBIOSNAME",
-       "RPC_PROXY_NETBIOSALIAS",
-
-       # domain controller stuff for Vampired DC
-       "VAMPIRE_DC_SERVER",
-       "VAMPIRE_DC_SERVER_IP",
-       "VAMPIRE_DC_SERVER_IPV6",
-       "VAMPIRE_DC_NETBIOSNAME",
-       "VAMPIRE_DC_NETBIOSALIAS",
-
-       # domain controller stuff for RODC
-       "RODC_DC_SERVER",
-       "RODC_DC_SERVER_IP",
-       "RODC_DC_SERVER_IPV6",
-       "RODC_DC_NETBIOSNAME",
-
-       # domain controller stuff for FL 2000 Vampired DC
-       "VAMPIRE_2000_DC_SERVER",
-       "VAMPIRE_2000_DC_SERVER_IP",
-       "VAMPIRE_2000_DC_SERVER_IPV6",
-       "VAMPIRE_2000_DC_NETBIOSNAME",
-       "VAMPIRE_2000_DC_NETBIOSALIAS",
-
-       "PROMOTED_DC_SERVER",
-       "PROMOTED_DC_SERVER_IP",
-       "PROMOTED_DC_SERVER_IPV6",
-       "PROMOTED_DC_NETBIOSNAME",
-       "PROMOTED_DC_NETBIOSALIAS",
-
-       # server stuff
-       "SERVER",
-       "SERVER_IP",
-       "SERVER_IPV6",
-       "NETBIOSNAME",
-       "NETBIOSALIAS",
-
-       # user stuff
-       "USERNAME",
-       "USERID",
-       "PASSWORD",
-       "DC_USERNAME",
-       "DC_PASSWORD",
-
-       # UID/GID for rfc2307 mapping tests
-       "UID_RFC2307TEST",
-       "GID_RFC2307TEST",
-
-       # misc stuff
-       "KRB5_CONFIG",
-       "KRB5CCNAME",
-       "SELFTEST_WINBINDD_SOCKET_DIR",
-       "NMBD_SOCKET_DIR",
-       "LOCAL_PATH",
-       "DNS_FORWARDER1",
-       "DNS_FORWARDER2",
-       "RESOLV_CONF",
-       "UNACCEPTABLE_PASSWORD",
-       "LOCK_DIR",
-       "SMBD_TEST_LOG",
-
-       # nss_wrapper
-       "NSS_WRAPPER_PASSWD",
-       "NSS_WRAPPER_GROUP",
-       "NSS_WRAPPER_HOSTS",
-       "NSS_WRAPPER_HOSTNAME",
-       "NSS_WRAPPER_MODULE_SO_PATH",
-       "NSS_WRAPPER_MODULE_FN_PREFIX",
-
-       # resolv_wrapper
-       "RESOLV_WRAPPER_CONF",
-       "RESOLV_WRAPPER_HOSTS",
-);
-
 sub sighandler($)
 {
        my $signame = shift;
@@ -939,7 +814,16 @@ sub setup_env($$)
 
        $option = "client" if $option eq "";
 
+       # Initially clear out the environment for the provision, so previous envs'
+       # variables don't leak in. Provisioning steps must explicitly set their
+       # necessary variables when calling out to other executables
+       Samba::clear_exported_envvars();
+       delete $ENV{SOCKET_WRAPPER_DEFAULT_IFACE};
+       delete $ENV{SMB_CONF_PATH};
+
+       $ENV{RESOLV_CONF} = "${selftest_resolv_conf_path}.${envname}/ignore";
        $ENV{KRB5CCNAME} = "FILE:${selftest_krbt_ccache_path}.${envname}/ignore";
+       $ENV{GNUPGHOME} = "${selftest_gnupghome_path}.${envname}/ignore";
 
        if (defined(get_running_env($envname))) {
                $testenv_vars = get_running_env($envname);
@@ -949,13 +833,19 @@ sub setup_env($$)
                }
        } else {
                $testenv_vars = $target->setup_env($envname, $prefix);
-               if (defined($testenv_vars) and $testenv_vars eq "UNKNOWN") {
-                   return $testenv_vars;
-               } elsif (defined($testenv_vars) && not defined($testenv_vars->{target})) {
-                       $testenv_vars->{target} = $target;
-               }
                if (not defined($testenv_vars)) {
-                       warn("$opt_target can't start up known environment '$envname'");
+                       my $msg = "$opt_target can't start up known environment '$envname'";
+                       if ($opt_one) {
+                               die($msg);
+                       }
+                       warn $msg;
+                       return;
+               }
+               if (ref $testenv_vars ne "HASH") {
+                       return $testenv_vars;
+               }
+               if (defined($testenv_vars->{target})) {
+                       $testenv_vars->{target} = $target;
                }
        }
 
@@ -974,13 +864,8 @@ sub setup_env($$)
                die("Unknown option[$option] for envname[$envname]");
        }
 
-       foreach (@exported_envvars) {
-               if (defined($testenv_vars->{$_})) {
-                       $ENV{$_} = $testenv_vars->{$_};
-               } else {
-                       delete $ENV{$_};
-               }
-       }
+       # export the environment variables for the testenv (SERVER, SERVER_IP, etc)
+       Samba::export_envvars($testenv_vars);
 
        my $krb5_ccache_path = "${selftest_krbt_ccache_path}.${envname}.${option}";
        unlink($krb5_ccache_path);
@@ -988,19 +873,6 @@ sub setup_env($$)
        return $testenv_vars;
 }
 
-sub exported_envvars_str($)
-{
-       my ($testenv_vars) = @_;
-       my $out = "";
-
-       foreach (@exported_envvars) {
-               next unless defined($testenv_vars->{$_});
-               $out .= $_."=".$testenv_vars->{$_}."\n";
-       }
-
-       return $out;
-}
-
 sub getlog_env($)
 {
        my ($envname) = @_;
@@ -1049,7 +921,7 @@ if ($opt_testenv) {
        $ENV{PIDDIR} = $testenv_vars->{PIDDIR};
        $ENV{ENVNAME} = $testenv_name;
 
-       my $envvarstr = exported_envvars_str($testenv_vars);
+       my $envvarstr = Samba::exported_envvars_str($testenv_vars);
 
        my @term_args = ("echo -e \"
 Welcome to the Samba4 Test environment '$testenv_name'
@@ -1066,6 +938,10 @@ $envvarstr
        my @term = ();
        if ($ENV{TERMINAL}) {
            @term = ($ENV{TERMINAL});
+               # override the default terminal args (if specified)
+               if (defined($ENV{TERMINAL_ARGS})) {
+                       @term_args = split(/ /, $ENV{TERMINAL_ARGS});
+               }
        } else {
            @term = ("xterm", "-e");
            unshift(@term_args, ("bash", "-c"));
@@ -1122,7 +998,7 @@ $envvarstr
                        next;
                }
 
-               # Generate a file with the individual tests to run, if the 
+               # Generate a file with the individual tests to run, if the
                # test runner for this test suite supports it.
                if ($individual_tests and $individual_tests->{$name}) {
                        if ($$_[3]) {