diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-04 16:23:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:00:15 -0500 |
| commit | 192240634ec0751b4f1b6913b6cfab11b6f3efbe (patch) | |
| tree | 2cfedbdd32b182b3b51c8187ec64be33127b2a68 | |
| parent | 2054c7228a6699b5fa3780640df2ff032aebe12e (diff) | |
| download | samba-192240634ec0751b4f1b6913b6cfab11b6f3efbe.tar.gz samba-192240634ec0751b4f1b6913b6cfab11b6f3efbe.tar.bz2 samba-192240634ec0751b4f1b6913b6cfab11b6f3efbe.zip | |
r14911: Allow easy modification of selftest subdirectory name
(This used to be commit 3de7b7fca1265fc465c895e15594659afd179ae5)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 2 | ||||
| -rw-r--r-- | source4/main.mk | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 5ba662a4d5..31e33f6d57 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/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/source4/main.mk b/source4/main.mk index c8a07be6ce..e127974ccd 100644 --- a/source4/main.mk +++ b/source4/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 |