summaryrefslogtreecommitdiff
path: root/selftest/target
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-02 14:23:43 -0700
committerAndrew Tridgell <tridge@samba.org>2010-10-02 21:11:53 -0700
commitdfb664a1822f41cbd4f1f5a8ce6fcac4e1547bf6 (patch)
treec4271f8edf108c8d4e4b353be3c67f9fb68a7ca1 /selftest/target
parent29e1a847ddb28aee8ae04578b74cb8ab97427b96 (diff)
downloadsamba-dfb664a1822f41cbd4f1f5a8ce6fcac4e1547bf6.tar.gz
samba-dfb664a1822f41cbd4f1f5a8ce6fcac4e1547bf6.tar.bz2
samba-dfb664a1822f41cbd4f1f5a8ce6fcac4e1547bf6.zip
s4-selftest: support 'make testenv SCREEN=1'
this can be used to start a test envioronment in screen windows. Use: make testenv SCREEN=1 SELFTEST_TESTENV=dc to launch just one environment (in this case, "dc")
Diffstat (limited to 'selftest/target')
-rw-r--r--selftest/target/Samba4.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 1e65c66384..36023f21c7 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1286,10 +1286,12 @@ sub setup_env($$$)
return $self->setup_rodc("$path/rodc", $self->{vars}->{dc});
} elsif ($envname eq "all") {
if (not defined($self->{vars}->{dc})) {
+ $ENV{ENVNAME} = "dc";
$self->setup_dc("$path/dc");
}
my $ret = $self->setup_member("$path/member", $self->{vars}->{dc});
if (not defined($self->{vars}->{rpc_proxy})) {
+ $ENV{ENVNAME} = "rpc_proxy";
my $rpc_proxy_ret = $self->setup_rpc_proxy("$path/rpc_proxy", $self->{vars}->{dc});
$ret->{RPC_PROXY_SERVER} = $rpc_proxy_ret->{SERVER};
@@ -1300,6 +1302,7 @@ sub setup_env($$$)
$ret->{RPC_PROXY_PASSWORD} = $rpc_proxy_ret->{PASSWORD};
}
if (not defined($self->{vars}->{fl2000dc})) {
+ $ENV{ENVNAME} = "fl2000dc";
my $fl2000dc_ret = $self->setup_fl2000dc("$path/fl2000dc", $self->{vars}->{dc});
$ret->{FL2000DC_SERVER} = $fl2000dc_ret->{SERVER};
@@ -1310,6 +1313,7 @@ sub setup_env($$$)
$ret->{FL2000DC_PASSWORD} = $fl2000dc_ret->{PASSWORD};
}
if (not defined($self->{vars}->{fl2003dc})) {
+ $ENV{ENVNAME} = "fl2003dc";
my $fl2003dc_ret = $self->setup_fl2003dc("$path/fl2003dc", $self->{vars}->{dc});
$ret->{FL2003DC_SERVER} = $fl2003dc_ret->{SERVER};
@@ -1320,6 +1324,7 @@ sub setup_env($$$)
$ret->{FL2003DC_PASSWORD} = $fl2003dc_ret->{PASSWORD};
}
if (not defined($self->{vars}->{fl2008r2dc})) {
+ $ENV{ENVNAME} = "fl2008r2dc";
my $fl2008r2dc_ret = $self->setup_fl2008r2dc("$path/fl2008r2dc", $self->{vars}->{dc});
$ret->{FL2008R2DC_SERVER} = $fl2008r2dc_ret->{SERVER};