From 9d958ce582fa760456b52d65a2deb36d8bd3794a Mon Sep 17 00:00:00 2001
From: Matthieu Patou <mat@freebsd.home.tridgell.net>
Date: Sun, 10 Oct 2010 10:12:46 +1100
Subject: build: make make tests SCREEN=1 work on freebsd

---
 selftest/target/Samba4.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'selftest/target')

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 36023f21c7..574c015a11 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -88,6 +88,7 @@ sub check_or_start($$$)
 	POSIX::mkfifo($env_vars->{SAMBA_TEST_FIFO}, 0700);
 	unlink($env_vars->{SAMBA_TEST_LOG});
 	
+	my $pwd = `pwd`;
 	print "STARTING SAMBA for $ENV{ENVNAME}\n";
 	my $pid = fork();
 	if ($pid == 0) {
@@ -138,9 +139,11 @@ sub check_or_start($$$)
 		if (defined($ENV{SAMBA_PROCESS_MODEL})) {
 			$model = $ENV{SAMBA_PROCESS_MODEL};
 		}
-		my $ret = system("$valgrind $samba $optarg $env_vars->{CONFIGURATION} -M $model -i");
+		chomp($pwd);
+		my $cmdline = "$valgrind ${pwd}/$samba $optarg $env_vars->{CONFIGURATION} -M $model -i";
+		my $ret = system("$cmdline");
 		if ($ret == -1) {
-			print "Unable to start $samba: $ret: $!\n";
+			print "Unable to start $cmdline: $ret: $!\n";
 			exit 1;
 		}
 		my $exit = ($ret >> 8);
-- 
cgit