svn commit: samba r19170 - in branches/SAMBA_3_0/source/script/tests: .

[metze at samba.org]

Author: metze
Date: 2006-10-08 20:38:25 +0000 (Sun, 08 Oct 2006)
New Revision: 19170

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19170

Log:
use a very clever trick to pass the binary name to the
gdb_backtrace script, I never noticed that %$(envvar)
exists...

Thanks to Bjoern Jacke for the suggestion!

metze
Modified:
   branches/SAMBA_3_0/source/script/tests/selftest.sh
   branches/SAMBA_3_0/source/script/tests/test_functions.sh


Changeset:
Modified: branches/SAMBA_3_0/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_3_0/source/script/tests/selftest.sh	2006-10-08 20:30:09 UTC (rev 19169)
+++ branches/SAMBA_3_0/source/script/tests/selftest.sh	2006-10-08 20:38:25 UTC (rev 19170)
@@ -106,7 +106,7 @@
 [global]
 	netbios name = TORTURE_6
 	interfaces = $TORTURE_INTERFACES
-	panic action = $SCRIPTDIR/gdb_backtrace %d
+	panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
 	include = $COMMONCONFFILE
 EOF
 
@@ -123,7 +123,7 @@
 	netbios name = $SERVER
 	interfaces = $SERVER_IP/8
 	bind interfaces only = yes
-	panic action = $SCRIPTDIR/gdb_backtrace %d
+	panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
 	include = $COMMONCONFFILE
 
 	; Necessary to add the build farm hacks
@@ -174,6 +174,9 @@
 SMBD_TEST_LOG="$PREFIX/smbd_test.log"
 export SMBD_TEST_LOG
 
+MAKE_TEST_BINARY=""
+export MAKE_TEST_BINARY
+
 # start off with 0 failures
 failed=0
 export failed

Modified: branches/SAMBA_3_0/source/script/tests/test_functions.sh
===================================================================
--- branches/SAMBA_3_0/source/script/tests/test_functions.sh	2006-10-08 20:30:09 UTC (rev 19169)
+++ branches/SAMBA_3_0/source/script/tests/test_functions.sh	2006-10-08 20:38:25 UTC (rev 19170)
@@ -43,8 +43,11 @@
 			if test x"$NMBD_MAXTIME" = x; then
 			    NMBD_MAXTIME=2700
 			fi
+			MAKE_TEST_BINARY=$BINDIR/nmbd
+			export MAKE_TEST_BINARY
 			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_NMBD_PID=$!
+			MAKE_TEST_BINARY=
 			echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid
 			wait $TIMELIMIT_NMBD_PID
 			ret=$?;
@@ -72,8 +75,11 @@
 			if test x"$SMBD_MAXTIME" = x; then
 			    SMBD_MAXTIME=2700
 			fi
+			MAKE_TEST_BINARY=$BINDIR/smbd
+			export MAKE_TEST_BINARY
 			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_SMBD_PID=$!
+			MAKE_TEST_BINARY=
 			echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid
 			wait $TIMELIMIT_SMBD_PID
 			ret=$?;
@@ -133,6 +139,7 @@
 	fi
 	name=$1
 	shift 1
+	binary=$1
 	cmdline="$*"
 
 	SERVERS_ARE_UP="no"
@@ -180,8 +187,11 @@
 		export SOCKET_WRAPPER_PCAP_FILE
 	fi
 
+	MAKE_TEST_BINARY=$binary
+	export MAKE_TEST_BINARY
 	( $cmdline > $TEST_LOG 2>&1 )
 	status=$?
+	MAKE_TEST_BINARY=
 	# show any additional output from smbd that has happened in this test
 	samba3_nmbd_test_log && {
 		new_log_size=`wc -l < $NMBD_TEST_LOG`;