svn commit: samba r14911 - in branches/SAMBA_4_0/source: . build/smb_build

[jelmer at samba.org]

Author: jelmer
Date: 2006-04-04 16:23:05 +0000 (Tue, 04 Apr 2006)
New Revision: 14911

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

Log:
Allow easy modification of selftest subdirectory name

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-04-04 16:21:08 UTC (rev 14910)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-04-04 16:23:05 UTC (rev 14911)
@@ -67,7 +67,7 @@
 	$self->output(<< "__EOD__"
 prefix = $self->{config}->{prefix}
 exec_prefix = $self->{config}->{exec_prefix}
-selftest_prefix = ./
+selftest_prefix = ./st
 VPATH = $self->{config}->{srcdir}:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
 srcdir = $self->{config}->{srcdir}
 builddir = $self->{config}->{builddir}

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-04-04 16:21:08 UTC (rev 14910)
+++ branches/SAMBA_4_0/source/main.mk	2006-04-04 16:23:05 UTC (rev 14911)
@@ -270,35 +270,35 @@
 test: $(DEFAULT_TEST_TARGET)
 
 test-swrap: all
-	./script/tests/selftest.sh ${selftest_prefix}/st all SOCKET_WRAPPER
+	./script/tests/selftest.sh ${selftest_prefix} all SOCKET_WRAPPER
 
 test-noswrap: all
-	./script/tests/selftest.sh ${selftest_prefix}/st all
+	./script/tests/selftest.sh ${selftest_prefix} all
 
 quicktest: all
-	./script/tests/selftest.sh ${selftest_prefix}/st quick SOCKET_WRAPPER
+	./script/tests/selftest.sh ${selftest_prefix} quick SOCKET_WRAPPER
 
 valgrindtest: valgrindtest-quick
 
 valgrindtest-quick: all
 	SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
-	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/st/valgrind.log" \
-	./script/tests/selftest.sh ${selftest_prefix}/st quick SOCKET_WRAPPER
+	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
+	./script/tests/selftest.sh ${selftest_prefix} quick SOCKET_WRAPPER
 
 valgrindtest-all: all
 	SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
-	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/st/valgrind.log" \
-	./script/tests/selftest.sh ${selftest_prefix}/st all SOCKET_WRAPPER
+	VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
+	./script/tests/selftest.sh ${selftest_prefix} all SOCKET_WRAPPER
 
 gdbtest: gdbtest-quick
 
 gdbtest-quick: all
 	SMBD_VALGRIND="xterm -n smbd -e gdb --args " \
-	./script/tests/selftest.sh ${selftest_prefix}/st quick SOCKET_WRAPPER
+	./script/tests/selftest.sh ${selftest_prefix} quick SOCKET_WRAPPER
 
 gdbtest-all: all
 	SMBD_VALGRIND="xterm -n smbd -e gdb --args " \
-	./script/tests/selftest.sh ${selftest_prefix}/st all SOCKET_WRAPPER
+	./script/tests/selftest.sh ${selftest_prefix} all SOCKET_WRAPPER
 
 unused_macros:
 	./script/find_unused_macros.pl `find . -name "*.[ch]"` | sort