sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r22605: Set up all required environments before starting tests.

Browse Source
This commit is contained in:
Jelmer Vernooij 2007-04-30 12:48:42 +00:00 committed by Gerald (Jerry) Carter
parent 5ff665b653
commit adf835a324
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/selftest/selftest.pl
View File

@ -134,6 +134,7 @@ my $ldap = undef;
my $opt_analyse_cmd = undef;
my $opt_resetup_env = undef;
my $opt_bindir = undef;
my $opt_no_lazy_setup = undef;
my $srcdir = ".";
my $builddir = ".";
@ -454,6 +455,7 @@ my $result = GetOptions (
'testenv' => \$opt_testenv,
'ldap:s' => \$ldap,
'analyse-cmd=s' => \$opt_analyse_cmd,
'no-lazy-setup' => \$opt_no_lazy_setup,
'resetup-environment' => \$opt_resetup_env,
'bindir:s' => \$opt_bindir,
);
@ -647,6 +649,7 @@ my @todo = ();
my $testsdir = "$srcdir/selftest";
$ENV{CONFIGURATION} = "--configfile=$conffile";
my %required_envs = ();
if ($opt_quick) {
open(IN, "$testsdir/tests_quick.sh|");
@ -661,8 +664,10 @@ while (<IN>) {
$env =~ s/\n//g;
my $cmdline = <IN>;
$cmdline =~ s/\n//g;
push (@todo, [$name, $env, $cmdline])
if (not defined($tests) or $name =~ /$tests/);
if (not defined($tests) or $name =~ /$tests/) {
$required_envs{$env} = 1;
push (@todo, [$name, $env, $cmdline]);
}
} else {
print;
}
@ -777,6 +782,10 @@ if ($from_build_farm) {
$msg_ops = $plain_msg_ops;
}
if ($opt_no_lazy_setup) {
setup_env($_) foreach (keys %required_envs);
}
if ($opt_testenv) {
my $testenv_name = $ENV{SELFTEST_TESTENV};
$testenv_name = "dc" unless defined($testenv_name);