Merge branch 'selftest' of git://git.samba.org/jelmer/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 15:19:23 +0000 (17:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 15:19:23 +0000 (17:19 +0200)
1  2 
source3/Makefile.in

diff --combined source3/Makefile.in
index 0e1d17f29e8cfb10c347a5f71959287c5b75066d,810666e0a9c0368104c2f3b79b58a6deba1f52e3..a0151d12f932017b8b9d95882a823fef35b10d28
@@@ -152,7 -152,7 +152,7 @@@ CODEPAGEDIR = @codepagedir
  # the directory where pid files go
  PIDDIR = @piddir@
  
 -FLAGS = -I. -I$(srcdir) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) -I$(CTDBDIR)/include $(ISA) -I$(srcdir)/lib -I.. -D_SAMBA_BUILD_=3
 +FLAGS = -I. -I$(srcdir) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) -I$(CTDBDIR)/include $(ISA) -I$(srcdir)/lib -I.. -D_SAMBA_BUILD_=3 -I../source4
  
  PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
        -DPRIVATE_DIR=\"$(PRIVATE_DIR)\" \
@@@ -984,11 -984,7 +984,11 @@@ REPLACETORT_OBJ = @libreplacedir@/test/
  NDRDUMP_OBJ = ../librpc/tools/ndrdump.o \
              $(PARAM_OBJ) $(LIBNDR_GEN_OBJ) \
              $(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
 -            librpc/gen_ndr/ndr_svcctl.o
 +                $(LIBNDR_DRSUAPI_OBJ) $(COMPRESSION_OBJ) \
 +            librpc/gen_ndr/ndr_svcctl.o \
 +                librpc/gen_ndr/tables.o ../librpc/ndr/ndr_table.o \
 +            ../librpc/ndr/ndr_krb5pac.o \
 +                librpc/gen_ndr/ndr_krb5pac.o libsmb/asn1.o
  
  DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o
  
@@@ -1212,7 -1208,7 +1212,7 @@@ modules:: SHOWFLAGS $(MODULES
  samba3-idl::
        @PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
         srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh librpc/idl/lsa.idl \
 -              ../librpc/idl/dfs.idl ../librpc/idl/echo.idl librpc/idl/winreg.idl \
 +              ../librpc/idl/dfs.idl ../librpc/idl/echo.idl ../librpc/idl/winreg.idl \
                ../librpc/idl/initshutdown.idl librpc/idl/srvsvc.idl ../librpc/idl/svcctl.idl \
                ../librpc/idl/eventlog.idl ../librpc/idl/wkssvc.idl librpc/idl/netlogon.idl \
                ../librpc/idl/notify.idl ../librpc/idl/epmapper.idl librpc/idl/messaging.idl \
                ../librpc/idl/ntsvcs.idl librpc/idl/libnetapi.idl ../librpc/idl/drsuapi.idl \
                ../librpc/idl/drsblobs.idl ../librpc/idl/nbt.idl
  
 +librpc/gen_ndr/tables.c:: librpc/gen_ndr/*.h
 +      @echo "Generating $@"
 +      @$(PERL) ../librpc/tables.pl $^ > $@
 +
  #####################################################################
  
  
@@@ -1547,7 -1539,7 +1547,7 @@@ bin/locktest2@EXEEXT@: $(BINARY_PREREQS
  bin/ndrdump@EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
 -              $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 +              $(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
  
  bin/debug2html@EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
        @echo Linking $@
@@@ -2807,6 -2799,9 +2807,9 @@@ valgrindtest:: all torture timelimi
         VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
         PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all "${smbtorture4_path}"
  
+ selftest::
+       ../selftest/selftest.pl --prefix=st --target=samba3 --testlist="`pwd`/selftest/tests.sh|" 
  # Check for Winbind struct 32/64bit padding
  test_wbpad:
        @echo "Testing winbind request/response structure for 32/64bit padding"