r14911: Allow easy modification of selftest subdirectory name

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 5ba662a4d54e7c3c310c444562e590e784427e72..31e33f6d577a9d7fa88790c1386e52f4b1582ee6 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -67,7 +67,7 @@ sub _prepare_path_vars($)
        $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}

diff --git a/source/main.mk b/source/main.mk
index c8a07be6ce75c9ed4037b34549def7ab6fdf1824..e127974ccd2ddb5f8ab211c741cee3e73ecdbb72 100644 (file)
--- a/source/main.mk
+++ b/source/main.mk
@@ -270,35 +270,35 @@ realdistclean: distclean removebackup
 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