diff options
| -rw-r--r-- | source3/Makefile.in | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index fa8defcad8..7c810678c1 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -871,6 +871,11 @@ bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS) $(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \ @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) +# It would be nice to build a static bigballofmud too, but when I try +# I get linker errors about dl_open and similar things. I'm not sure +# if it can be fixed or if they just can't be called from a static +# library. + libsmbclient: $(LIBSMBCLIENT) bin/librpc_lsarpc.@SHLIBEXT@: $(RPC_LSA_OBJ) @@ -990,6 +995,12 @@ bin/tdbbackup@EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TDBBACKUP_OBJ) +bin/t_strcmp@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_strcmp.o + $(CC) $(FLAGS) -o $@ $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud + +bin/t_stringoverflow@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_stringoverflow.o + $(CC) $(FLAGS) -o $@ torture/t_stringoverflow.o -L./bin -lbigballofmud + install: installbin installman installscripts installdat installswat install-everything: install installmodules @@ -1210,33 +1221,18 @@ config.status: $(srcdir)/configure Makefile: $(srcdir)/Makefile.in config.status @echo "WARNING: you need to run ./config.status" -test_prefix=/tmp/test-samba -# Run regression suite using the external "satyr" framework -check: - @echo "** Sorry, samba self-test without installation does not work " - @echo "** yet. Please try specifying a scratch directory to" - @echo "** ./configure --prefix DIR" - @echo "** then run \"make install installcheck\"" - exit 1 - -# -rm -rf $(test_prefix)/lib -# mkdir $(test_prefix)/lib -p ./testdir -# PATH=$(builddir)/bin:$(PATH) \ -# SATYR_SUITEDIR=../testsuite/build_farm/ prefix=$(test_prefix) \ -# testdir=./testdir $(SHELL) satyr - -# Run regression suite on the installed version. - -# `installcheck' -# Perform installation tests (if any). The user must build and -# install the program before running the tests. You should not -# assume that `$(bindir)' is in the search path. - -dangerous-installcheck: - mkdir -p $(BASEDIR)/lib - mkdir -p $(BASEDIR)/var - PATH=$(BINDIR):$(SBINDIR):$(PATH) \ - SATYR_DISCOURAGE=1 \ - SATYR_SUITEDIR=../testsuite/satyr/ prefix=$(BASEDIR) \ - LIBSMB_PROG=$(SBINDIR)/smbd \ - testdir=./testdir $(SHELL) satyr +###################################################################### +# Samba Testing Framework + +# FIXME: LD_LIBRARY_PATH is not portable, but in the absence of +# libtool I don't know a better way to do it. Perhaps we should fix +# libbigballofmud to link statically? + +check: check-programs + LD_LIBRARY_PATH="`pwd`/bin:$$LD_LIBRARY_PATH" \ + PATH="`pwd`/bin:$$PATH" \ + python stf/standardcheck.py + +# These are called by the test suite +check-programs: bin/t_strcmp + |