summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-21 21:26:40 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-21 21:26:40 +0200
commit0e9008be35a5b334bd65e6417193d4b8f27bdc36 (patch)
treefef74e65fb2e8dd56f7f72c7742e8e36581ab009 /source4/selftest
parent69577aa34b23ea2573bcea901586719f2fe14826 (diff)
downloadsamba-0e9008be35a5b334bd65e6417193d4b8f27bdc36.tar.gz
samba-0e9008be35a5b334bd65e6417193d4b8f27bdc36.tar.bz2
samba-0e9008be35a5b334bd65e6417193d4b8f27bdc36.zip
Rename smbd -> samba.
Diffstat (limited to 'source4/selftest')
-rw-r--r--source4/selftest/config.mk12
-rwxr-xr-xsource4/selftest/selftest.pl4
-rw-r--r--source4/selftest/target/Samba4.pm26
-rwxr-xr-xsource4/selftest/test_win.sh2
4 files changed, 22 insertions, 22 deletions
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 5503a42cdd..2fcb71eb7a 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -52,30 +52,30 @@ testenv:: everything
valgrindtest:: valgrindtest-all
valgrindtest-quick:: all
- SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
+ SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
$(SELFTEST) $(SELFTEST_QUICK_OPTS) --immediate --socket-wrapper $(TESTS)
valgrindtest-all:: everything
- SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
+ SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate --socket-wrapper $(TESTS)
valgrindtest-env:: everything
- SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
+ SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/valgrind_run $(LD_LIBPATH_OVERRIDE)" \
VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
gdbtest:: gdbtest-all
gdbtest-quick:: all
- SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
+ SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
$(SELFTEST) $(SELFTEST_QUICK_OPTS) --immediate --socket-wrapper $(TESTS)
gdbtest-all:: everything
- SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
+ SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --immediate --socket-wrapper $(TESTS)
gdbtest-env:: everything
- SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
+ SMBD_VALGRIND="xterm -n server -e $(srcdir)/script/gdb_run $(LD_LIBPATH_OVERRIDE)" \
$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index 51a354c7a4..92aa67e8d3 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -303,7 +303,7 @@ Target Specific:
--expected-failures=FILE specify list of tests that is guaranteed to fail
Samba4 Specific:
- --ldap=openldap|fedora-ds back smbd onto specified ldap server
+ --ldap=openldap|fedora-ds back samba onto specified ldap server
Samba3 Specific:
--bindir=PATH path to binaries
@@ -809,7 +809,7 @@ if ($opt_testenv) {
Welcome to the Samba4 Test environment '$testenv_name'
This matches the client environment used in make test
-smbd is pid `cat \$PIDDIR/smbd.pid`
+server is pid `cat \$PIDDIR/samba.pid`
Some useful environment variables:
TORTURE_OPTIONS=\$TORTURE_OPTIONS
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 992e251c35..9364008ee2 100644
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -116,20 +116,20 @@ sub check_or_start($$$)
if (defined($ENV{SMBD_OPTIONS})) {
$optarg.= " $ENV{SMBD_OPTIONS}";
}
- my $ret = system("$valgrind $self->{bindir}/smbd $optarg $env_vars->{CONFIGURATION} -M single -i --leak-report-full");
+ my $ret = system("$valgrind $self->{bindir}/samba $optarg $env_vars->{CONFIGURATION} -M single -i --leak-report-full");
if ($? == -1) {
- print "Unable to start smbd: $ret: $!\n";
+ print "Unable to start samba: $ret: $!\n";
exit 1;
}
unlink($env_vars->{SMBD_TEST_FIFO});
my $exit = $? >> 8;
if ( $ret == 0 ) {
- print "smbd exits with status $exit\n";
+ print "samba exits with status $exit\n";
} elsif ( $ret & 127 ) {
- print "smbd got signal ".($ret & 127)." and exits with $exit!\n";
+ print "samba got signal ".($ret & 127)." and exits with $exit!\n";
} else {
$ret = $? >> 8;
- print "smbd failed with status $exit!\n";
+ print "samba failed with status $exit!\n";
}
exit $exit;
}
@@ -498,7 +498,7 @@ sub provision($$$$$$)
{
my ($self, $prefix, $server_role, $netbiosname, $netbiosalias, $swiface, $password) = @_;
- my $smbd_loglevel = 1;
+ my $server_loglevel = 1;
my $username = "administrator";
my $domain = "SAMBADOMAIN";
my $realm = "SAMBA.EXAMPLE.COM";
@@ -571,7 +571,7 @@ sub provision($$$$$$)
ldb:nosync = true
#We don't want to pass our self-tests if the PAC code is wrong
gensec:require_pac = true
- log level = $smbd_loglevel
+ log level = $server_loglevel
[tmp]
path = $tmpdir
@@ -606,7 +606,7 @@ sub provision($$$$$$)
cifs:server = $netbiosname
cifs:share = tmp
#There is no username specified here, instead the client is expected
-#to log in with kerberos, and smbd will used delegated credentials.
+#to log in with kerberos, and the serverwill use delegated credentials.
[simple]
path = $tmpdir
@@ -828,8 +828,8 @@ sub provision_dc($$)
$self->add_wins_config("$prefix/private") or
die("Unable to add wins configuration");
- $ret->{SMBD_TEST_FIFO} = "$prefix/smbd_test.fifo";
- $ret->{SMBD_TEST_LOG} = "$prefix/smbd_test.log";
+ $ret->{SMBD_TEST_FIFO} = "$prefix/server_test.fifo";
+ $ret->{SMBD_TEST_LOG} = "$prefix/server_test.log";
$ret->{SMBD_TEST_LOG_POS} = 0;
return $ret;
}
@@ -841,8 +841,8 @@ sub teardown_env($$)
close(DATA);
- if (-f "$envvars->{PIDDIR}/smbd.pid" ) {
- open(IN, "<$envvars->{PIDDIR}/smbd.pid") or die("unable to open smbd pid file");
+ if (-f "$envvars->{PIDDIR}/samba.pid" ) {
+ open(IN, "<$envvars->{PIDDIR}/samba.pid") or die("unable to open server pid file");
$pid = <IN>;
close(IN);
@@ -858,7 +858,7 @@ sub teardown_env($$)
# If it is still around, kill it
if ($count > 20) {
- print "smbd process $pid took more than $count seconds to exit, killing\n";
+ print "server process $pid took more than $count seconds to exit, killing\n";
kill 9, $pid;
}
}
diff --git a/source4/selftest/test_win.sh b/source4/selftest/test_win.sh
index bc40620af5..17c09e6b26 100755
--- a/source4/selftest/test_win.sh
+++ b/source4/selftest/test_win.sh
@@ -32,7 +32,7 @@ name="NET against Windows 2003"
testit "$name" smb $WINTEST_DIR/wintest_net.sh $SMBTORTURE_REMOTE_HOST \
$SMBTORTURE_USERNAME $SMBTORTURE_PASSWORD $SMBTORTURE_WORKGROUP
-name="Windows 2003 against smbd"
+name="Windows 2003 against samba"
testit "$name" smb $WINTEST_DIR/wintest_client.sh $SMBTORTURE_REMOTE_HOST
dc_tests="RPC-DRSUAPI ncacn_np ncacn_ip_tcp"