Rev 11895: Make sure the right binaries are used. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 11895
revision-id: jelmer at samba.org-20070417123659-yqoyuis1mvjh2kz8
parent: jelmer at samba.org-20070417121100-58zt3zyuny95tia2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Tue 2007-04-17 14:36:59 +0200
message:
  Make sure the right binaries are used.
modified:
  source/script/tests/Samba3.pm  svn-v2:21909 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fSamba3.pm
=== modified file 'source/script/tests/Samba3.pm'
--- a/source/script/tests/Samba3.pm	2007-04-17 12:11:00 +0000
+++ b/source/script/tests/Samba3.pm	2007-04-17 12:36:59 +0000
@@ -14,7 +14,9 @@
 	my ($self, $binary) = @_;
 
 	if (defined($self->{bindir})) {
-		return "$self->{bindir}/$binary";
+		my $path = "$self->{bindir}/$binary";
+		-f $path or die("File $path doesn't exist");
+		return $path;
 	}
 
 	return $binary;
@@ -54,7 +56,7 @@
 
 	my $vars = $self->provision($path);
 
-	$self->check_or_start($vars, $ENV{NMBD_MAXTIME} or 2700, $ENV{SMBD_MAXTIME} or 2700);
+	$self->check_or_start($vars, ($ENV{NMBD_MAXTIME} or 2700), ($ENV{SMBD_MAXTIME} or 2700));
 
 	$self->wait_for_start($vars);
 
@@ -96,7 +98,7 @@
 		open STDERR, '>&STDOUT';
 	
 		$ENV{MAKE_TEST_BINARY} = $self->binpath("nmbd");
-		exec("timelimit", $nmbd_maxtime, $self->binpath("nmbd"), "-F", "-S", "--no-process-group", "-d0" ,"-s", $env_vars->{SERVERCONFFILE}) or die("Unable to start nmbd");
+		exec($self->binpath("timelimit"), $nmbd_maxtime, $self->binpath("nmbd"), "-F", "-S", "--no-process-group", "-d0" ,"-s", $env_vars->{SERVERCONFFILE}) or die("Unable to start nmbd: $!");
 	}
 	open(PID, ">$env_vars->{PIDDIR}/timelimit.nmbd.pid");
 	print PID $pid;
@@ -111,7 +113,7 @@
 		open STDERR, '>&STDOUT';
 	
 		$ENV{MAKE_TEST_BINARY} = $self->binpath("smbd");
-		exec("timelimit", $nmbd_maxtime, $self->binpath("smbd"), "-F", "-S", "--no-process-group", "-d0" ,"-s", $env_vars->{SERVERCONFFILE}) or die("Unable to start nmbd");
+		exec($self->binpath("timelimit"), $nmbd_maxtime, $self->binpath("smbd"), "-F", "-S", "--no-process-group", "-d0" ,"-s", $env_vars->{SERVERCONFFILE}) or die("Unable to start smbd: $!");
 	}
 	open(PID, ">$env_vars->{PIDDIR}/timelimit.smbd.pid");
 	print PID $pid;
@@ -175,8 +177,7 @@
 	my $shrdir="$prefix_abs/tmp";
 	my $libdir="$prefix_abs/lib";
 	my $piddir="$prefix_abs/pid";
-	my $conffile="$libdir/client.conf";
-	my $serverconffile="$libdir/server.conf";
+	my $conffile="$libdir/server.conf";
 	my $privatedir="$prefix_abs/private";
 	my $lockdir="$prefix_abs/lockdir";
 	my $logdir="$prefix_abs/logs";
@@ -185,14 +186,15 @@
 	## 
 	## create the test directory layout
 	##
+	mkdir($prefix_abs);
 	print "CREATE TEST ENVIRONMENT IN '$prefix'...";
-	system("/bin/rm -rf $prefix/*");
+	system("rm -rf $prefix_abs/*");
 	mkdir($_) foreach($privatedir,$libdir,$piddir,$lockdir,$logdir);
 	my $tmpdir = "$prefix_abs/tmp";
 	mkdir($tmpdir);
 	chmod 0777, $tmpdir;
 
-	open(CONF, ">$serverconffile");
+	open(CONF, ">$conffile") or die("Unable to open $conffile");
 	print CONF "
 [global]
 	workgroup = $domain
@@ -259,8 +261,10 @@
 
 	print "DONE\n";
 
+	$ret{SERVER_IP} = $server_ip;
 	$ret{NMBD_TEST_LOG} = "$prefix/nmbd_test.log";
 	$ret{SMBD_TEST_LOG} = "$prefix/smbd_test.log";
+	$ret{SERVERCONFFILE} = $conffile;
 	$ret{CONFIGURATION} ="-s $conffile";
 	$ret{SERVER} = $server;
 	$ret{USERNAME} = $username;
@@ -279,15 +283,15 @@
 	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("bin/nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} __SAMBA__");
-	system("bin/nmblookup $envvars->{CONFIGURATION} __SAMBA__");
-	system("bin/nmblookup $envvars->{CONFIGURATION} -U 127.255.255.255 __SAMBA__");
-	system("bin/nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} $envvars->{SERVER}");
-	system("bin/nmblookup $envvars->{CONFIGURATION} $envvars->{SERVER}");
+	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("bin/smbclient $envvars->{CONFIGURATION} -L $envvars->{SERVER_IP} -U% -p 139 | head -2");
-	system("bin/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");
+	system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER_IP} -U% -p 139 | head -2");
 }
 
 1;