The branch, v4-0-test has been updated
via d9b4a5bb172be74db3c16b50426810f1bdedd00e (commit)
via 50b8a16d0cb5e1c4352e73900d1e98a812340cca (commit)
via caa0da310da47a48a9add6de3d309984ae14f59c (commit)
from 1b5706e413f1c6aa1ede15a625929f785ce37272 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit d9b4a5bb172be74db3c16b50426810f1bdedd00e
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Wed Jan 16 17:50:29 2008 +0100
python: Don't attempt to build shared and static versions of modules,
because it's just not going to work with the current build system.
commit 50b8a16d0cb5e1c4352e73900d1e98a812340cca
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Wed Jan 16 17:40:25 2008 +0100
selftest: Add some more documentation. Rename env => target to avoid
confusion.
commit caa0da310da47a48a9add6de3d309984ae14f59c
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Wed Jan 16 16:53:21 2008 +0100
Ignore newly generated proto header.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +-
source/build/smb_build/input.pm | 2 +-
source/selftest/README | 17 +
source/selftest/env/Samba3.pm | 434 ------------------
source/selftest/env/Samba4.pm | 915 -------------------------------------
source/selftest/env/Windows.pm | 40 --
source/selftest/selftest.pl | 9 +-
source/selftest/target/Samba3.pm | 434 ++++++++++++++++++
source/selftest/target/Samba4.pm | 915 +++++++++++++++++++++++++++++++++++++
source/selftest/target/Windows.pm | 40 ++
10 files changed, 1412 insertions(+), 1396 deletions(-)
delete mode 100644 source/selftest/env/Samba3.pm
delete mode 100644 source/selftest/env/Samba4.pm
delete mode 100644 source/selftest/env/Windows.pm
create mode 100644 source/selftest/target/Samba3.pm
create mode 100644 source/selftest/target/Samba4.pm
create mode 100644 source/selftest/target/Windows.pm
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index ccc1265..9ed0334 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,7 @@ source/lib/util/pidfile.h
source/lib/util/unix_privs.h
source/lib/util/util_proto.h
source/lib/util/wrap_xattr.h
+source/lib/util/asn1_proto.h
source/libcli/finddcs.h
source/libcli/libcli_proto.h
source/libcli/auth/proto.h
@@ -79,7 +80,6 @@ source/libcli/resolve/proto.h
source/libcli/security/proto.h
source/libcli/smb2/smb2_proto.h
source/libcli/smb_composite/proto.h
-source/libcli/util/asn1_proto.h
source/libcli/util/clilsa.h
source/libcli/util/proto.h
source/libcli/wrepl/winsrepl_proto.h
diff --git a/source/build/smb_build/input.pm b/source/build/smb_build/input.pm
index 0b26aee..6d5c4f4 100644
--- a/source/build/smb_build/input.pm
+++ b/source/build/smb_build/input.pm
@@ -182,7 +182,7 @@ sub check_python($$$)
$python->{SUBSYSTEM} = "LIBPYTHON";
- check_module($INPUT, $python, ["SHARED_LIBRARY", "STATIC_LIBRARY"]);
+ check_module($INPUT, $python, $default_ot);
}
sub check_binary($$)
diff --git a/source/selftest/README b/source/selftest/README
index a0afda3..3250f32 100644
--- a/source/selftest/README
+++ b/source/selftest/README
@@ -1,6 +1,23 @@
+# vim: ft=rst
+
This directory contains test scripts that are useful for running a
bunch of tests all at once.
+===============
+Available tests
+===============
+The available tests are obtained from a script, usually
+selftest/samba{3,4}_tests.sh. This script should for each test output
+the name of the test, the command to run and the environment that should be
+provided.
+
+============
+Environments
+============
+Tests often need to run against a server with particular things set up,
+a "environment". This environment is provided by the test "target": Samba 3,
+Samba 4 or Windows.
+
The following environments are currently available:
- none: No server set up, no variables set.
diff --git a/source/selftest/env/Samba3.pm b/source/selftest/env/Samba3.pm
deleted file mode 100644
index b0c4eb2..0000000
--- a/source/selftest/env/Samba3.pm
+++ /dev/null
@@ -1,434 +0,0 @@
-#!/usr/bin/perl
-# Bootstrap Samba and run a number of tests against it.
-# Copyright (C) 2005-2007 Jelmer Vernooij <[EMAIL PROTECTED]>
-# Published under the GNU GPL, v3 or later.
-
-package Samba3;
-
-use strict;
-use Cwd qw(abs_path);
-use FindBin qw($RealBin);
-use POSIX;
-
-sub binpath($$)
-{
- my ($self, $binary) = @_;
-
- if (defined($self->{bindir})) {
- my $path = "$self->{bindir}/$binary";
- -f $path or die("File $path doesn't exist");
- return $path;
- }
-
- return $binary;
-}
-
-sub new($$) {
- my ($classname, $bindir) = @_;
- my $self = { bindir => $bindir };
- bless $self;
- return $self;
-}
-
-sub teardown_env($$)
-{
- my ($self, $envvars) = @_;
-
- my $smbdpid = read_pid($envvars, "smbd");
- my $nmbdpid = read_pid($envvars, "nmbd");
-# my $winbinddpid = read_pid($envvars, "winbindd");
-
- $self->stop_sig_term($smbdpid);
- $self->stop_sig_term($nmbdpid);
-# $self->stop_sig_term($winbinddpid);
- $self->stop_sig_kill($smbdpid);
- $self->stop_sig_kill($nmbdpid);
-# $self->stop_sig_kill($winbinddpid);
-
- return 0;
-}
-
-sub getlog_env_app($$$)
-{
- my ($self, $envvars, $name) = @_;
-
- my $title = "$name LOG of: $envvars->{NETBIOSNAME}\n";
- my $out = $title;
-
- open(LOG, "<".$envvars->{$name."_TEST_LOG"});
-
- seek(LOG, $envvars->{$name."_TEST_LOG_POS"}, SEEK_SET);
- while (<LOG>) {
- $out .= $_;
- }
- $envvars->{$name."_TEST_LOG_POS"} = tell(LOG);
- close(LOG);
-
- return "" if $out eq $title;
-
- return $out;
-}
-
-sub getlog_env($$)
-{
- my ($self, $envvars) = @_;
- my $ret = "";
-
- $ret .= $self->getlog_env_app($envvars, "SMBD");
- $ret .= $self->getlog_env_app($envvars, "NMBD");
-# $ret .= $self->getlog_env_app($envvars, "WINBINDD");
-
- return $ret;
-}
-
-sub check_env($$)
-{
- my ($self, $envvars) = @_;
-
- # TODO ...
- return 1;
-}
-
-sub setup_env($$$)
-{
- my ($self, $envname, $path) = @_;
-
- if ($envname eq "dc") {
- return $self->setup_dc("$path/dc");
- } else {
- return undef;
- }
-}
-
-sub setup_dc($$)
-{
- my ($self, $path) = @_;
-
- my $vars = $self->provision($path, "dc");
-
- $self->check_or_start($vars,
- ($ENV{NMBD_MAXTIME} or 2700),
- ($ENV{WINBINDD_MAXTIME} or 2700),
- ($ENV{SMBD_MAXTIME} or 2700));
-
- $self->wait_for_start($vars);
-
- return $vars;
-}
-
-sub stop($)
-{
- my ($self) = @_;
-}
-
-sub stop_sig_term($$) {
- my ($self, $pid) = @_;
- kill("USR1", $pid) or kill("ALRM", $pid) or warn("Unable to kill $pid:
$!");
-}
-
-sub stop_sig_kill($$) {
- my ($self, $pid) = @_;
- kill("ALRM", $pid) or warn("Unable to kill $pid: $!");
-}
-
-sub write_pid($$$)
-{
- my ($env_vars, $app, $pid) = @_;
-
- open(PID, ">$env_vars->{PIDDIR}/timelimit.$app.pid");
- print PID $pid;
- close(PID);
-}
-
-sub read_pid($$)
-{
- my ($env_vars, $app) = @_;
-
- open(PID, "<$env_vars->{PIDDIR}/timelimit.$app.pid");
- my $pid = <PID>;
- close(PID);
- return $pid;
-}
-
-sub check_or_start($$$$) {
- my ($self, $env_vars, $nmbd_maxtime, $winbindd_maxtime, $smbd_maxtime)
= @_;
-
- unlink($env_vars->{NMBD_TEST_LOG});
- print "STARTING NMBD...";
- my $pid = fork();
- if ($pid == 0) {
- open STDOUT, ">$env_vars->{NMBD_TEST_LOG}";
- open STDERR, '>&STDOUT';
-
- $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
-
- my @optargs = ("-d0");
- if (defined($ENV{NMBD_OPTIONS})) {
- @optargs = split(/ /, $ENV{NMBD_OPTIONS});
- }
-
- $ENV{MAKE_TEST_BINARY} = $self->binpath("nmbd");
-
- my @preargs = ($self->binpath("timelimit"), $nmbd_maxtime);
- if(defined($ENV{NMBD_VALGRIND})) {
- @preargs = split(/ /, $ENV{NMBD_VALGRIND});
- }
-
- exec(@preargs, $self->binpath("nmbd"), "-F", "-S",
"--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or
die("Unable to start nmbd: $!");
- }
- write_pid($env_vars, "nmbd", $pid);
- print "DONE\n";
-
-# disable winbindd until the build-farm faked_users work with it
-# unlink($env_vars->{WINBINDD_TEST_LOG});
-# print "STARTING WINBINDD...";
-# $pid = fork();
-# if ($pid == 0) {
-# open STDOUT, ">$env_vars->{WINBINDD_TEST_LOG}";
-# open STDERR, '>&STDOUT';
-#
-# $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
-#
-# my @optargs = ("-d0");
-# if (defined($ENV{WINBINDD_OPTIONS})) {
-# @optargs = split(/ /, $ENV{WINBINDD_OPTIONS});
-# }
-#
-# $ENV{MAKE_TEST_BINARY} = $self->binpath("winbindd");
-# exec($self->binpath("timelimit"), $winbindd_maxtime,
$ENV{WINBINDD_VALGRIND}, $self->binpath("winbindd"), "-F", "-S",
"--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or
die("Unable to start winbindd: $!");
-# }
-# write_pid($env_vars, "winbindd", $pid);
-# print "DONE\n";
-
- unlink($env_vars->{SMBD_TEST_LOG});
- print "STARTING SMBD...";
- $pid = fork();
- if ($pid == 0) {
- open STDOUT, ">$env_vars->{SMBD_TEST_LOG}";
- open STDERR, '>&STDOUT';
-
- $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
-
- $ENV{MAKE_TEST_BINARY} = $self->binpath("smbd");
- my @optargs = ("-d0");
- if (defined($ENV{SMBD_OPTIONS})) {
- @optargs = split(/ /, $ENV{SMBD_OPTIONS});
- }
- my @preargs = ($self->binpath("timelimit"), $smbd_maxtime);
- if(defined($ENV{SMBD_VALGRIND})) {
- @preargs = split(/ /,$ENV{SMBD_VALGRIND});
- }
- exec(@preargs, $self->binpath("smbd"), "-F", "-S",
"--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or
die("Unable to start smbd: $!");
- }
- write_pid($env_vars, "smbd", $pid);
- print "DONE\n";
-
- return 0;
-}
-
-sub create_clientconf($$$)
-{
- my ($self, $prefix, $domain) = @_;
-
- my $lockdir = "$prefix/locks";
- my $logdir = "$prefix/logs";
- my $piddir = "$prefix/pid";
- my $privatedir = "$prefix/private";
- my $scriptdir = "$RealBin/..";
- my $conffile = "$prefix/smb.conf";
-
- my
$torture_interfaces='127.0.0.6/8,127.0.0.7/8,127.0.0.8/8,127.0.0.9/8,127.0.0.10/8,127.0.0.11/8';
- open(CONF, ">$conffile");
- print CONF "
-[global]
- workgroup = $domain
-
- private dir = $privatedir
- pid directory = $piddir
- lock directory = $lockdir
- log file = $logdir/log.\%m
- log level = 0
-
- name resolve order = bcast
-
- netbios name = TORTURE_6
- interfaces = $torture_interfaces
- panic action = $scriptdir/gdb_backtrace \%d %\$(MAKE_TEST_BINARY)
-
- passdb backend = tdbsam
- ";
- close(CONF);
-}
-
-sub provision($$$)
-{
- my ($self, $prefix, $role) = @_;
-
- ##
- ## setup the various environment variables we need
- ##
-
- my %ret = ();
- my $server = "LOCALHOST2";
- my $server_ip = "127.0.0.2";
- my $domain = "SAMBA-TEST";
-
- my $username = `PATH=/usr/ucb:$ENV{PATH} whoami`;
- chomp $username;
- my $password = "test";
-
- my $srcdir="$RealBin/..";
- my $scriptdir="$srcdir/selftest";
- my $prefix_abs = abs_path($prefix);
-
- my @dirs = ();
-
- my $shrdir="$prefix_abs/share";
- push(@dirs,$shrdir);
-
- my $libdir="$prefix_abs/lib";
- push(@dirs,$libdir);
-
- my $piddir="$prefix_abs/pid";
- push(@dirs,$piddir);
-
- my $privatedir="$prefix_abs/private";
- push(@dirs,$privatedir);
-
- my $lockdir="$prefix_abs/lockdir";
- push(@dirs,$lockdir);
-
- my $logdir="$prefix_abs/logs";
- push(@dirs,$logdir);
-
- # this gets autocreated by winbindd
- my $wbsockdir="$prefix_abs/winbindd";
- my $wbsockprivdir="$lockdir/winbindd_privileged";
-
- ##
- ## create the test directory layout
- ##
- mkdir($prefix_abs, 0777);
- print "CREATE TEST ENVIRONMENT IN '$prefix'...";
- system("rm -rf $prefix_abs/*");
- mkdir($_, 0777) foreach(@dirs);
-
- my $conffile="$libdir/server.conf";
-
- open(CONF, ">$conffile") or die("Unable to open $conffile");
- print CONF "
-[global]
- workgroup = $domain
-
- private dir = $privatedir
- pid directory = $piddir
- lock directory = $lockdir
- log file = $logdir/log.\%m
- log level = 0
-
- name resolve order = bcast
-
- netbios name = $server
- interfaces = $server_ip/8
- bind interfaces only = yes
- panic action = $scriptdir/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
-
- passdb backend = tdbsam
-
- ; Necessary to add the build farm hacks
- add user script = /bin/false
- add machine script = /bin/false
-
- kernel oplocks = no
- kernel change notify = no
-
- syslog = no
- printing = bsd
- printcap name = /dev/null
-
-";
-
- if ($role eq "dc") {
- print CONF "\tdomain logons = yes\n";
- print CONF "\tdomain master = yes\n";
- }
-
-print CONF "
-
- winbindd:socket dir = $wbsockdir
-
-[tmp]
- path = $shrdir
- read only = no
- smbd:sharedelay = 100000
- map hidden = yes
- map system = yes
- create mask = 755
-[hideunread]
- copy = tmp
- hide unreadable = yes
-[hideunwrite]
- copy = tmp
- hide unwriteable files = yes
-[print1]
- copy = tmp
- printable = yes
- printing = test
-[print2]
- copy = print1
-[print3]
- copy = print1
-[print4]
- copy = print1
- ";
- close(CONF);
-
- ##
- ## create a test account
- ##
-
- open(PWD, "|".$self->binpath("smbpasswd")." -c $conffile -L -s -a
$username");
- print PWD "$password\n$password\n";
- close(PWD) or die("Unable to set password for test account");
-
- print "DONE\n";
-
- $ret{SERVER_IP} = $server_ip;
- $ret{NMBD_TEST_LOG} = "$prefix/nmbd_test.log";
- $ret{WINBINDD_TEST_LOG} = "$prefix/winbindd_test.log";
- $ret{SMBD_TEST_LOG} = "$prefix/smbd_test.log";
- $ret{SERVERCONFFILE} = $conffile;
- $ret{CONFIGURATION} ="-s $conffile";
- $ret{SERVER} = $server;
- $ret{USERNAME} = $username;
- $ret{DOMAIN} = $domain;
- $ret{NETBIOSNAME} = $server;
- $ret{PASSWORD} = $password;
- $ret{PIDDIR} = $piddir;
- $ret{WINBINDD_SOCKET_DIR} = $wbsockdir;
- $ret{WINBINDD_PRIV_PIPE_DIR} = $wbsockprivdir;
- return \%ret;
-}
-
-sub wait_for_start($$)
-{
- my ($self, $envvars) = @_;
-
- # give time for nbt server to register its names
- print "delaying for nbt name registration\n";
- sleep(10);
- # This will return quickly when things are up, but be slow if we need
to wait for (eg) SSL init
- system($self->binpath("nmblookup") ." $envvars->{CONFIGURATION} -U
$envvars->{SERVER_IP} __SAMBA__");
- system($self->binpath("nmblookup") ." $envvars->{CONFIGURATION}
__SAMBA__");
- system($self->binpath("nmblookup") ." $envvars->{CONFIGURATION} -U
127.255.255.255 __SAMBA__");
- system($self->binpath("nmblookup") ." $envvars->{CONFIGURATION} -U
$envvars->{SERVER_IP} $envvars->{SERVER}");
- system($self->binpath("nmblookup") ." $envvars->{CONFIGURATION}
$envvars->{SERVER}");
- # make sure smbd is also up set
- print "wait for smbd\n";
- system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L
$envvars->{SERVER_IP} -U% -p 139 | head -2");
- system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L
$envvars->{SERVER_IP} -U% -p 139 | head -2");
-
- print $self->getlog_env($envvars);
-}
-
--
Samba Shared Repository
