sub check_or_start($$$)
{
- my ($self, $env_vars, $process_model) = @_;
- return 0 if ( -p $env_vars->{SAMBA_TEST_FIFO});
+ my ($self, $env_vars, $process_model) = @_;
- unlink($env_vars->{SAMBA_TEST_FIFO});
- POSIX::mkfifo($env_vars->{SAMBA_TEST_FIFO}, 0700);
- unlink($env_vars->{SAMBA_TEST_LOG});
-
- my $pwd = `pwd`;
- print "STARTING SAMBA for $ENV{ENVNAME}\n";
+ return 0 if $self->check_env($env_vars);
+
+ # use a pipe for stdin in the child processes. This allows
+ # those processes to monitor the pipe for EOF to ensure they
+ # exit when the test script exits
+ pipe(STDIN_READER, $env_vars->{STDIN_PIPE});
+
+ print "STARTING SAMBA...";
my $pid = fork();
if ($pid == 0) {
- open STDIN, $env_vars->{SAMBA_TEST_FIFO};
# we want out from samba to go to the log file, but also
# to the users terminal when running 'make test' on the command
# line. This puts it on stderr on the terminal
SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
- my $valgrind = "";
- if (defined($ENV{SAMBA_VALGRIND})) {
- $valgrind = $ENV{SAMBA_VALGRIND};
- }
-
$ENV{KRB5_CONFIG} = $env_vars->{KRB5_CONFIG};
$ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+ $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
$ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
$ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
$ENV{UID_WRAPPER} = "1";
- # Start slapd before samba, but with the fifo on stdin
- if (defined($self->{ldap})) {
- unless($self->slapd_start($env_vars)) {
- warn("couldn't start slapd (main run)");
- return undef;
- }
- }
-
- my $optarg = "";
- $optarg = "--maximum-runtime=$self->{server_maxtime}";
+ $ENV{MAKE_TEST_BINARY} = Samba::bindir_path($self, "samba");
+ my @preargs = ();
+ my @optargs = ();
if (defined($ENV{SAMBA_OPTIONS})) {
- $optarg.= " $ENV{SAMBA_OPTIONS}";
+ @optargs = split(/ /, $ENV{SAMBA_OPTIONS});
}
- my $samba = Samba::bindir_path($self, "samba");
-
- chomp($pwd);
- my $cmdline = "$valgrind ${pwd}/$samba $optarg $env_vars->{CONFIGURATION} -M $process_model -i";
- my $ret = system("$cmdline");
- if ($ret == -1) {
- print "Unable to start $cmdline: $ret: $!\n";
- exit 1;
+ if(defined($ENV{SAMBA_VALGRIND})) {
+ @preargs = split(/ /,$ENV{SAMBA_VALGRIND});
}
- my $exit = ($ret >> 8);
- unlink($env_vars->{SAMBA_TEST_FIFO});
- if ($ret == 0) {
- print "$samba exited with no error\n";
- exit 0;
- } elsif ( $ret & 127 ) {
- print "$samba got signal ".($ret & 127)." and exits with $exit!\n";
- } else {
- print "$samba failed with status $exit!\n";
- }
- if ($exit == 0) {
- $exit = -1;
- }
- exit $exit;
+
+ close($env_vars->{STDIN_PIPE});
+ open STDIN, ">&", \*STDIN_READER or die "can't dup STDIN_READER to STDIN: $!";
+
+ exec(@preargs, Samba::bindir_path($self, "samba"), "-M", $process_model, "-i", "--maximum-runtime=$self->{server_maxtime}", $env_vars->{CONFIGURATION}, @optargs) or die("Unable to start samba: $!");
}
+ $env_vars->{SAMBA_PID} = $pid;
print "DONE\n";
- open(DATA, ">$env_vars->{SAMBA_TEST_FIFO}");
+ close(STDIN_READER);
return $pid;
}
EOF
}
-sub provision_raw_prepare($$$$$$$$$$)
+sub provision_raw_prepare($$$$$$$$$)
{
my ($self, $prefix, $server_role, $hostname,
$domain, $realm, $functional_level,
- $swiface, $password, $kdc_ipv4) = @_;
+ $password, $kdc_ipv4) = @_;
my $ctx;
my $netbiosname = uc($hostname);
warn("Unable to clean up");
}
+
+ my $swiface = Samba::get_interface($hostname);
+
$ctx->{prefix} = $prefix;
$ctx->{prefix_abs} = $prefix_abs;
SAMBA_TEST_FIFO => "$ctx->{prefix}/samba_test.fifo",
SAMBA_TEST_LOG => "$ctx->{prefix}/samba_test.log",
SAMBA_TEST_LOG_POS => 0,
- NSS_WRAPPER_WINBIND_SO_PATH => Samba::bindir_path($self, "default/nsswitch/libnss-winbind.so")
+ NSS_WRAPPER_WINBIND_SO_PATH => Samba::bindir_path($self, "default/nsswitch/libnss-winbind.so"),
+ LOCAL_PATH => $ctx->{tmpdir}
};
return $ret;
return $ret;
}
-sub provision($$$$$$$$$)
+sub provision($$$$$$$$)
{
my ($self, $prefix, $server_role, $hostname,
$domain, $realm, $functional_level,
- $swiface, $password, $kdc_ipv4, $extra_smbconf_options) = @_;
+ $password, $kdc_ipv4, $extra_smbconf_options) = @_;
my $ctx = $self->provision_raw_prepare($prefix, $server_role,
$hostname,
$domain, $realm, $functional_level,
- $swiface, $password, $kdc_ipv4);
+ $password, $kdc_ipv4);
$ctx->{tmpdir} = "$ctx->{prefix_abs}/tmp";
push(@{$ctx->{directories}}, "$ctx->{tmpdir}");
read only = no
posix:sharedelay = 10000
posix:oplocktimeout = 3
- posix:writetimeupdatedelay = 500000
+ posix:writetimeupdatedelay = 50000
[xcopy_share]
path = $ctx->{tmpdir}
read only = no
posix:sharedelay = 10000
posix:oplocktimeout = 3
- posix:writetimeupdatedelay = 500000
+ posix:writetimeupdatedelay = 50000
create mask = 777
force create mode = 777
"SAMBADOMAIN",
"samba.example.com",
"2008",
- 23,
"locMEMpass3",
$dcvars->{SERVER_IP},
"");
"SAMBADOMAIN",
"samba.example.com",
"2008",
- 24,
"locRPCproxypass4",
$dcvars->{SERVER_IP},
$extra_smbconf_options);
"SAMBADOMAIN",
"samba.example.com",
"2008",
- 22, $dcvars->{PASSWORD},
+ $dcvars->{PASSWORD},
$dcvars->{SERVER_IP});
$ctx->{smb_conf_extra_options} = "
"SAMBASUBDOM",
"sub.samba.example.com",
"2008",
- 31, $dcvars->{PASSWORD},
+ $dcvars->{PASSWORD},
undef);
$ctx->{smb_conf_extra_options} = "
my ($self, $prefix) = @_;
print "PROVISIONING DC...";
+ my $extra_conf_options = "netbios aliases = localDC1-a
+allow dns updates = True";
my $ret = $self->provision($prefix,
"domain controller",
"localdc",
"SAMBADOMAIN",
"samba.example.com",
"2008",
- 21,
"locDCpass1",
- undef, "netbios aliases = localDC1-a");
+ undef, $extra_conf_options);
return undef unless(defined $ret);
unless($self->add_wins_config("$prefix/private")) {
"SAMBA2000",
"samba2000.example.com",
"2000",
- 25,
"locDCpass5",
undef, "");
"SAMBA2003",
"samba2003.example.com",
"2003",
- 26,
"locDCpass6",
undef, "");
"SAMBA2008R2",
"samba2008R2.example.com",
"2008_R2",
- 27,
"locDCpass7",
undef, "");
"SAMBADOMAIN",
"samba.example.com",
"2008",
- 28, $dcvars->{PASSWORD},
+ $dcvars->{PASSWORD},
$dcvars->{SERVER_IP});
unless ($ctx) {
return undef;
read only = no
posix:sharedelay = 10000
posix:oplocktimeout = 3
- posix:writetimeupdatedelay = 500000
+ posix:writetimeupdatedelay = 50000
";
my $extra_smbconf_options = "
server services = -smb +s3fs
-dcerpc endpoint servers = -unixinfo -rpcecho -spoolss -winreg -wkssvc -srvsvc
-
-[IPC\$]
- vfs objects = dfs_samba4
+dcerpc endpoint servers = -unixinfo -spoolss -winreg -wkssvc -srvsvc
";
"PLUGINDOMAIN",
"plugin.samba.example.com",
"2008",
- 30,
"locDCpass1",
undef, $extra_smbconf_options);
"CHDCDOMAIN",
"chgdcpassword.samba.example.com",
"2008",
- 31,
"chgDCpass1",
undef);
my ($self, $envvars) = @_;
my $pid;
- close(DATA);
+ # This should cause samba to terminate gracefully
+ close($envvars->{STDIN_PIPE});
- if (open(IN, "<$envvars->{PIDDIR}/samba.pid")) {
- $pid = <IN>;
- close(IN);
+ $pid = $envvars->{SAMBA_PID};
+ my $count = 0;
+ my $childpid;
+
+ # This should give it time to write out the gcov data
+ until ($count > 20) {
+ if (Samba::cleanup_child($pid, "samba") == -1) {
+ last;
+ }
+ sleep(1);
+ $count++;
+ }
- # Give the process 20 seconds to exit. gcov needs
- # this time to write out the covarge data
- my $count = 0;
- until (kill(0, $pid) == 0) {
- # if no process sucessfully signalled, then we are done
- sleep(1);
- $count++;
- last if $count > 20;
- }
+ if ($count <= 20 && kill(0, $pid) == 0) {
+ return;
+ }
- # If it is still around, kill it
- if ($count > 20) {
- print "server process $pid took more than $count seconds to exit, killing\n";
- kill 9, $pid;
- }
+ kill "TERM", $pid;
+
+ until ($count > 20) {
+ if (Samba::cleanup_child($pid, "samba") == -1) {
+ last;
+ }
+ sleep(1);
+ $count++;
}
- my $failed = $? >> 8;
+ # If it is still around, kill it
+ if ($count > 20 && kill(0, $pid) == 0) {
+ warn "server process $pid took more than $count seconds to exit, killing\n";
+ kill 9, $pid;
+ }
$self->slapd_stop($envvars) if ($self->{ldap});
print $self->getlog_env($envvars);
- return $failed;
+ return;
}
sub getlog_env($$)
{
my ($self, $envvars) = @_;
- return (-p $envvars->{SAMBA_TEST_FIFO});
+ my $childpid = Samba::cleanup_child($envvars->{SAMBA_PID}, "samba");
+
+ return ($childpid == 0);
}
sub setup_env($$$)
git.samba.org / amitay / samba.git / blobdiff