Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
authorJelmer Vernooij <jelmer@samba.org>
Fri, 19 Sep 2008 14:26:00 +0000 (16:26 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 19 Sep 2008 14:26:00 +0000 (16:26 +0200)
1  2 
source4/librpc/config.mk
source4/selftest/samba4_tests.sh

diff --combined source4/librpc/config.mk
index 8ace68fdb2aa45c79542a308d67256d4cc6c6f34,05848bc3a495d78cc64a74b35364e30bbb8bcac7..cf41f9884a2b2ae8cf8e0334fd4bb987e3713d8a
@@@ -682,7 -682,7 +682,7 @@@ python_atsvc_OBJ_FILES = $(gen_ndrsrcdi
  
  [PYTHON::python_dcerpc_nbt]
  LIBRARY_REALNAME = samba/nbt.$(SHLIBEXT)
- PRIVATE_DEPENDENCIES = NDR_NBT PYTALLOC param swig_credentials python_dcerpc
+ PRIVATE_DEPENDENCIES = NDR_NBT PYTALLOC param swig_credentials python_dcerpc python_dcerpc_misc python_dcerpc_security
  
  python_dcerpc_nbt_OBJ_FILES = $(gen_ndrsrcdir)/py_nbt.o
  
@@@ -743,6 -743,7 +743,6 @@@ python_dcerpc_security_OBJ_FILES = $(ge
  $(IDL_HEADER_FILES) $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \
        $(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \
        $(IDL_NDR_SERVER_C_FILES) $(IDL_SWIG_FILES) \
 -      $(IDL_NDR_EJS_C_FILES) $(IDL_NDR_EJS_H_FILES) \
        $(IDL_NDR_PY_C_FILES) $(IDL_NDR_PY_H_FILES): idl
  
  idl_full:: $(pidldir)/lib/Parse/Pidl/IDL.pm $(pidldir)/lib/Parse/Pidl/Expr.pm 
index 192f5698e4b925827fb798e1e764b369459d4966,a72024e9e1c7fea658a70db7645482a6f08e7415..bdebddf260516c27bb9795fc21c7436b7faf3abc
@@@ -60,8 -60,12 +60,8 @@@ $incdir/../bin/smbtorture -
  
  samba4srcdir=$incdir/..
  samba4bindir=$samba4srcdir/bin
 -SCRIPTDIR=$samba4srcdir/../testprogs/ejs
  smb4torture="$samba4bindir/smbtorture $TORTURE_OPTIONS"
  
 -plantest "js.base" dc "$SCRIPTDIR/base.js" $CONFIGURATION
 -plantest "js.ldb" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION -d 10
 -
  # Simple tests for LDAP and CLDAP
  
  for options in "" "--option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD"; do
@@@ -265,7 -269,7 +265,7 @@@ f
  
  bbdir=$incdir/../../testprogs/blackbox
  
- plantest "blackbox.ndrdump" dc $samba4srcdir/librpc/tests/test_ndrdump.sh
+ plantest "blackbox.ndrdump" none $samba4srcdir/librpc/tests/test_ndrdump.sh
  plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
  plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" $CONFIGURATION 
  plantest "blackbox.cifsdd" dc $samba4srcdir/client/tests/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" 
@@@ -283,6 -287,10 +283,6 @@@ for t in "BASE-RW1"; d
      plantest "ntvfs.simple.`normalize_testname $t`" dc $VALGRIND $smb4torture $ADDARGS //\$SERVER/simple -U"\$USERNAME"%"\$PASSWORD" $t
  done
  
 -DATADIR=$samba4srcdir/../testdata
 -
 -plantest "js.samba3sam" none $samba4bindir/smbscript $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
 -
  # Domain Member Tests
  
  plantest "rpc.echo against member server with local creds" member $VALGRIND $smb4torture ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" RPC-ECHO "$*"