PY3: ensure output of subprocess.Popen is decoded

[kai/samba-autobuild/.git] / selftest / selftest.pl

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 12452bc420d320a7be82be37df941d1aacb91f17..3ee266c4d0ac9e94c74d132d4c12e5c5b620696e 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -28,6 +28,7 @@ use lib "$RealBin";
 use Subunit;
 use SocketWrapper;
 use target::Samba;
+use Time::HiRes qw(time);
 
 eval {
 require Time::HiRes;
@@ -59,6 +60,7 @@ 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_use_dns_faking = 0;
 my @testlists = ();
 
@@ -150,9 +152,9 @@ sub run_testsuite($$$$$)
 
        Subunit::start_testsuite($name);
        Subunit::progress_push();
-       Subunit::report_time(time());
+       Subunit::report_time();
        system($cmd);
-       Subunit::report_time(time());
+       Subunit::report_time();
        Subunit::progress_pop();
 
        if ($? == -1) {
@@ -224,6 +226,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
@@ -274,6 +277,7 @@ 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,
                'use-dns-faking' => \$opt_use_dns_faking
            );
 
@@ -377,6 +381,14 @@ if ($opt_socket_wrapper_pcap) {
 
 my $ld_preload = $ENV{LD_PRELOAD};
 
+if ($opt_libasan_so_path) {
+       if ($ld_preload) {
+               $ld_preload = "$ld_preload:$opt_libasan_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";
@@ -781,7 +793,7 @@ my $suitestotal = $#todo + 1;
 
 unless ($opt_list) {
        Subunit::progress($suitestotal);
-       Subunit::report_time(time());
+       Subunit::report_time();
 }
 
 my $i = 0;
@@ -803,7 +815,9 @@ sub get_running_env($)
 my @exported_envvars = (
        # domain stuff
        "DOMAIN",
+       "DNSNAME",
        "REALM",
+       "DOMSID",
 
        # stuff related to a trusted domain
        "TRUST_SERVER",
@@ -814,6 +828,7 @@ my @exported_envvars = (
        "TRUST_PASSWORD",
        "TRUST_DOMAIN",
        "TRUST_REALM",
+       "TRUST_DOMSID",
 
        # domain controller stuff
        "DC_SERVER",
@@ -868,6 +883,7 @@ my @exported_envvars = (
        "SERVER_IPV6",
        "NETBIOSNAME",
        "NETBIOSALIAS",
+       "SAMSID",
 
        # user stuff
        "USERNAME",
@@ -939,6 +955,15 @@ 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
+       foreach (@exported_envvars) {
+               delete $ENV{$_};
+       }
+       delete $ENV{SOCKET_WRAPPER_DEFAULT_IFACE};
+       delete $ENV{SMB_CONF_PATH};
+
        $ENV{KRB5CCNAME} = "FILE:${selftest_krbt_ccache_path}.${envname}/ignore";
 
        if (defined(get_running_env($envname))) {