diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-11-21 17:52:35 +1100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2012-11-22 10:21:17 +0100 |
| commit | 7626b5d9045c2b490b38dee7dd45ba7763740f83 (patch) | |
| tree | 5baff2f323b4ce7f3c6a491dd71421fbcbfbcd7f /source3/Makefile.in | |
| parent | 8a2ef49dea36b103a87cf2aa63417737dd754ce6 (diff) | |
| download | samba-7626b5d9045c2b490b38dee7dd45ba7763740f83.tar.gz samba-7626b5d9045c2b490b38dee7dd45ba7763740f83.tar.bz2 samba-7626b5d9045c2b490b38dee7dd45ba7763740f83.zip | |
build: Remove --enable-smbtorture, require bin/smbtorture (from waf) for make test
This simply moves this to being a side-effect of --enable-selftest.
The flag was renamed from --enable-smbtorture4 in a recent patch.
Make test now relies on smbtorture4, and so this code to make the dependency
optional for the tests is not required any more.
Andrew Bartlett
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index c533929f73..a2d7906e03 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1602,7 +1602,7 @@ pam_winbind: SHOWFLAGS bin/pam_winbind.@SHLIBEXT@ gpext_modules:: $(GPEXT_MODULES) -torture:: SHOWFLAGS basics $(TORTURE_PROGS) @SMBTORTURE@ +torture:: SHOWFLAGS basics $(TORTURE_PROGS) smbtorture3 : SHOWFLAGS bin/smbtorture3 @@ -3274,7 +3274,7 @@ test_pam_modules:: pam_modules ## Targets for 'make test' ## -valgrindtest:: all torture timelimit +valgrindtest:: all torture timelimit bin/smbtorture @echo Running Test suite with valgrind @$(MAKE) test \ NMBD_VALGRIND="xterm -n nmbd -e valgrind -q --db-attach=yes --num-callers=30" \ @@ -3286,7 +3286,7 @@ selftestdir = ../selftest S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)" -test:: all torture timelimit +test:: all torture timelimit bin/smbtorture @LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \ NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \ SELFTESTDIR="$(selftestdir)" SELFTESTPREFIX="$(selftest_prefix)" \ |