git.samba.org / nivanova / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 88ad1a9 fc7050e)
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
authorJelmer Vernooij <jelmer@samba.org>
Thu, 18 Sep 2008 18:29:05 +0000 (20:29 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 18 Sep 2008 18:29:05 +0000 (20:29 +0200)
Conflicts:
source4/main.mk

1  2 
pidl/pidl patch | diff1 | diff2 | blob | history
source4/Makefile patch | diff1 | diff2 | blob | history
source4/configure.ac patch | diff1 | diff2 | blob | history
source4/main.mk patch | diff1 | diff2 | blob | history
source4/selftest/samba4_tests.sh patch | diff1 | diff2 | blob | history

diff --combined pidl/pidl
index 577db0a53fda2852f408263bb1e20d6656f1d744,e58442ba1b696edb0eb84b0cad392ac720dd1aa7..577db0a53fda2852f408263bb1e20d6656f1d744
--- 1/source4/pidl/pidl
--- 2/pidl/pidl
+++ b/pidl/pidl
@@@ -17,7 -17,7 +17,7 @@@ pidl - An IDL compiler written in Per
  
  pidl --help
  
 -pidl [--outputdir[=OUTNAME]] [--includedir DIR...] [--parse-idl-tree] [--dump-idl-tree] [--dump-ndr-tree] [--header[=OUTPUT]] [--ejs[=OUTPUT]] [--python[=OUTPUT]] [--swig[=OUTPUT]] [--ndr-parser[=OUTPUT]] [--client] [--server] [--warn-compat] [--quiet] [--verbose] [--template] [--ws-parser[=OUTPUT]] [--diff] [--dump-idl] [--tdr-parser[=OUTPUT]] [--samba3-ndr-client[=OUTPUT]] [--samba3-ndr-server[=OUTPUT]] [--typelib=[OUTPUT]] [<idlfile>.idl]...
 +pidl [--outputdir[=OUTNAME]] [--includedir DIR...] [--parse-idl-tree] [--dump-idl-tree] [--dump-ndr-tree] [--header[=OUTPUT]] [--python[=OUTPUT]] [--swig[=OUTPUT]] [--ndr-parser[=OUTPUT]] [--client] [--server] [--warn-compat] [--quiet] [--verbose] [--template] [--ws-parser[=OUTPUT]] [--diff] [--dump-idl] [--tdr-parser[=OUTPUT]] [--samba3-ndr-client[=OUTPUT]] [--samba3-ndr-server[=OUTPUT]] [--typelib=[OUTPUT]] [<idlfile>.idl]...
  
  =head1 DESCRIPTION
  
@@@ -478,6 -478,7 +478,6 @@@ my($opt_ndr_parser)
  my($opt_tdr_parser);
  my($opt_ws_parser);
  my($opt_swig);
 -my($opt_ejs);
  my($opt_python);
  my($opt_quiet) = 0;
  my($opt_outputdir) = '.';
@@@ -520,6 -521,7 +520,6 @@@ Samba 4 output
   --ndr-parser[=OUTFILE]  create a C NDR parser [ndr_BASENAME.c]
   --client[=OUTFILE]      create a C NDR client [ndr_BASENAME_c.c]
   --tdr-parser[=OUTFILE]  create a C TDR parser [tdr_BASENAME.c]
 - --ejs[=OUTFILE]         create ejs wrapper file [BASENAME_ejs.c]
   --python[=OUTFILE]      create python wrapper file [py_BASENAME.c]
   --swig[=OUTFILE]        create swig wrapper file [BASENAME.i]
   --server[=OUTFILE]      create server boilerplate [ndr_BASENAME_s.c]
@@@ -565,6 -567,7 +565,6 @@@ my $result = GetOptions 
            'ndr-parser:s' => \$opt_ndr_parser,
            'client:s' => \$opt_client,
            'ws-parser:s' => \$opt_ws_parser,
 -          'ejs' => \$opt_ejs,
                'python' => \$opt_python,
            'diff' => \$opt_diff,
            'swig:s' => \$opt_swig,
@@@ -661,6 -664,7 +661,6 @@@ sub process_file($
            defined($opt_server) or 
            defined($opt_header) or
            defined($opt_ndr_parser) or
 -          defined($opt_ejs) or 
            defined($opt_python) or 
            defined($opt_dump_ndr_tree) or
            defined($opt_samba3_header) or 
@@@ -705,6 -709,14 +705,6 @@@
                  FileSave($filename, $code);
        }
  
 -      if (defined($opt_ejs)) {
 -              require Parse::Pidl::Samba4::EJS;
 -              my $generator = new Parse::Pidl::Samba4::EJS(); 
 -              my ($hdr,$prsr) = $generator->Parse($ndr, $h_filename);
 -              FileSave("$outputdir/ndr_$basename\_ejs.c", $prsr);
 -              FileSave("$outputdir/ndr_$basename\_ejs.h", $hdr);
 -      }
 -
        if (defined($opt_python)) {
                require Parse::Pidl::Samba4::Python;
                my $generator = new Parse::Pidl::Samba4::Python(); 
diff --combined source4/Makefile
index 1c4c2611b09376ca668ce579633ab7ab37ddb0a7,7a5ec4c0d024279309a32b943d7b84e7107743df..bc470742c66c1f4df2baebeb25fc06333c4920bc
--- 1/source4/Makefile
--- 2/source4/Makefile
+++ b/source4/Makefile
@@@ -8,11 -8,12 +8,11 @@@ default: al
  
  include mkconfig.mk
  
- pidldir := $(srcdir)/pidl
+ pidldir := $(srcdir)/../pidl
  
  BASEDIR = $(prefix)
  TORTUREDIR = $(libdir)/torture
  SWATDIR = $(datadir)/swat
 -JSDIR = $(datadir)/js
  SETUPDIR = $(datadir)/setup
  NCALRPCDIR = $(localstatedir)/ncalrpc
  
@@@ -61,7 -62,7 +61,7 @@@ libsrcdir := li
  libsocketsrcdir := lib/socket
  libcharsetsrcdir := lib/charset
  ldb_sambasrcdir := lib/ldb-samba
- tdbsrcdir := lib/tdb
+ tdbsrcdir := ../lib/tdb
  ldbsrcdir := lib/ldb
  libtlssrcdir := lib/tls
  libregistrysrcdir := lib/registry
@@@ -69,9 -70,9 +69,9 @@@ smbreadlinesrcdir := lib/smbreadlin
  libmessagingsrcdir := lib/messaging
  libeventssrcdir := lib/events
  libcmdlinesrcdir := lib/cmdline
- poptsrcdir := lib/popt
- socketwrappersrcdir := lib/socket_wrapper
- nsswrappersrcdir := lib/nss_wrapper
+ poptsrcdir := ../lib/popt
+ socketwrappersrcdir := ../lib/socket_wrapper
+ nsswrappersrcdir := ../lib/nss_wrapper
  appwebsrcdir := lib/appweb
  libstreamsrcdir := lib/stream
  libutilsrcdir := lib/util
@@@ -80,7 -81,7 +80,7 @@@ libdbwrapsrcdir := lib/dbwra
  libcryptosrcdir := lib/crypto
  libtorturesrcdir := lib/torture
  smb_serversrcdir := smb_server
- libcompressionsrcdir := lib/compression
+ libcompressionsrcdir := ../lib/compression
  libgencachesrcdir := lib
  paramsrcdir := param
  rpc_serversrcdir := rpc_server
@@@ -97,10 -98,12 +97,11 @@@ ntvfssrcdir := ntvf
  ntptrsrcdir := ntptr
  librpcsrcdir := librpc
  libclisrcdir := libcli
 -ejsscriptsrcdir := scripting/ejs
  pyscriptsrcdir := $(srcdir)/scripting/python
  kdcsrcdir := kdc
  ntp_signdsrcdir := ntp_signd
  wmisrcdir := lib/wmi
+ tallocsrcdir := ../lib/talloc
  
  include data.mk
  
@@@ -161,6 -164,7 +162,6 @@@ showlayout:
        @echo '  lockdir:     $(lockdir)'
        @echo '  logfilebase: $(logfilebase)'
        @echo '  setupdir:    $(SETUPDIR)'
 -      @echo '  jsdir:       $(JSDIR)'
        @echo '  swatdir:     $(SWATDIR)'
        @echo '  mandir:      $(mandir)'
        @echo '  torturedir:  $(TORTUREDIR)'
@@@ -230,7 -234,7 +231,7 @@@ installman:: manpages installdir
        @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
  
  installmisc:: installdirs
 -      @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(JSDIR) $(DESTDIR)$(SETUPDIR) $(DESTDIR)$(bindir)
 +      @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(SETUPDIR) $(DESTDIR)$(bindir)
  
  installpc:: installdirs
        @$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(PKGCONFIGDIR) $(PC_FILES)
diff --combined source4/configure.ac
index cfae02bb6c11be683195c95c928ed5e49c61f61b,a445dc62a653bd9914220da919d98edd5d2d3735..fa2d8d99506c47437705bf18979cc2a8edbeaf06
--- 1/source4/configure.ac
--- 2/source4/configure.ac
+++ b/source4/configure.ac
@@@ -11,7 -11,7 +11,7 @@@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Mar
  
  # Configuration rules.
  m4_include(build/m4/env.m4)
- m4_include(lib/replace/samba.m4)
+ m4_include(../lib/replace/samba.m4)
  m4_include(lib/smbreadline/readline.m4)
  m4_include(heimdal_build/config.m4)
  m4_include(lib/util/fault.m4)
@@@ -21,12 -21,12 +21,12 @@@ m4_include(lib/util/fsusage.m4
  m4_include(lib/util/xattr.m4)
  m4_include(lib/util/capability.m4)
  m4_include(lib/util/time.m4)
- m4_include(lib/popt/samba.m4)
+ m4_include(../lib/popt/samba.m4)
  m4_include(lib/charset/config.m4)
  m4_include(lib/socket/config.m4)
  m4_include(lib/zlib.m4)
  m4_include(nsswitch/nsstest.m4)
- m4_include(pidl/config.m4)
+ m4_include(../pidl/config.m4)
  
  AC_CONFIG_FILES(lib/registry/registry.pc)
  AC_CONFIG_FILES(lib/events/events.pc)
@@@ -41,20 -41,20 +41,20 @@@ AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc
  SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
        [],
        [
-               m4_include(lib/talloc/libtalloc.m4)
-               SMB_INCLUDE_MK(lib/talloc/config.mk)
+               m4_include(../lib/talloc/libtalloc.m4)
+               SMB_INCLUDE_MK(../lib/talloc/config.mk)
        ]
  )
  
  SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
        [],
        [
-               m4_include(lib/tdb/libtdb.m4)
-               SMB_INCLUDE_MK(lib/tdb/config.mk)
+               m4_include(../lib/tdb/libtdb.m4)
+               SMB_INCLUDE_MK(../lib/tdb/config.mk)
        ]
  )
  
- SMB_INCLUDE_MK(lib/tdb/python.mk) 
+ SMB_INCLUDE_MK(../lib/tdb/python.mk) 
  
  SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
        [
@@@ -99,11 -99,12 +99,11 @@@ m4_include(auth/gensec/config.m4
  m4_include(smbd/process_model.m4)
  m4_include(ntvfs/posix/config.m4)
  m4_include(ntvfs/unixuid/config.m4)
- m4_include(lib/socket_wrapper/config.m4)
- m4_include(lib/nss_wrapper/config.m4)
+ m4_include(../lib/socket_wrapper/config.m4)
+ m4_include(../lib/nss_wrapper/config.m4)
  m4_include(auth/config.m4)
  m4_include(kdc/config.m4)
  m4_include(ntvfs/sysdep/config.m4)
 -m4_include(lib/appweb/config.m4)
  m4_include(nsswitch/config.m4)
  
  #################################################
@@@ -158,7 -159,7 +158,7 @@@ the
        builddir_headers="-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib ";
  fi
  
- CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
+ CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../lib/replace -I\$(srcdir)/../lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
  
  SMB_WRITE_PERLVARS(build/smb_build/config.pm)
  
diff --combined source4/main.mk
index ea410bd0556b3027d7a7f73f90dedc5a0ceeb524,ddeb4baf2ecc2e64d4272afba68e705b027b327d..0edfa1c14418ee54ebfb3a56ffeab4bcc09b2685
--- 1/source4/main.mk
--- 2/source4/main.mk
+++ b/source4/main.mk
@@@ -16,8 -16,9 +16,8 @@@ mkinclude lib/registry/config.m
  mkinclude lib/messaging/config.mk
  mkinclude lib/events/config.mk
  mkinclude lib/cmdline/config.mk
- mkinclude lib/socket_wrapper/config.mk
- mkinclude lib/nss_wrapper/config.mk
+ mkinclude ../lib/socket_wrapper/config.mk
+ mkinclude ../lib/nss_wrapper/config.mk
 -mkinclude lib/appweb/config.mk
  mkinclude lib/stream/config.mk
  mkinclude lib/util/config.mk
  mkinclude lib/tdr/config.mk
@@@ -46,5 -47,6 +46,5 @@@ mkinclude torture/config.m
  mkinclude librpc/config.mk
  mkinclude client/config.mk
  mkinclude libcli/config.mk
 -mkinclude scripting/ejs/config.mk
  mkinclude scripting/python/config.mk
  mkinclude kdc/config.mk
diff --combined source4/selftest/samba4_tests.sh
index a13c596f6d81391a2e5cd4e9e2c9674cffcceb30,3c2bb134b0ad9574bb920e571394a34102ca5a03..192f5698e4b925827fb798e1e764b369459d4966
--- 1/source4/selftest/samba4_tests.sh
--- 2/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@@ -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
@@@ -151,6 -155,7 +151,7 @@@ for t in $net; d
  done
  
  # Tests for session keys
+ # FIXME: Integrate these into a single smbtorture test
  
  bindoptions=""
  transport="ncacn_np"
@@@ -250,7 -255,7 +251,7 @@@ f
  if test x"${PIDL_TESTS_SKIP}" = x"yes"; then
     echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes"
  elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
-   for f in $samba4srcdir/pidl/tests/*.pl; do
+   for f in $samba4srcdir/../pidl/tests/*.pl; do
       plantest "pidl.`basename $f .pl`" none $PERL $f "|" $samba4srcdir/script/harness2subunit.pl
    done
  else 
@@@ -259,22 -264,22 +260,22 @@@ f
  
  # Blackbox Tests:
  # tests that interact directly with the command-line tools rather than using 
- # the API
+ # the API. These mainly test that the various command-line options of commands 
+ # work correctly.
  
  bbdir=$incdir/../../testprogs/blackbox
  
- plantest "blackbox.ndrdump" dc $bbdir/test_ndrdump.sh
+ plantest "blackbox.ndrdump" dc $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" 
  plantest "blackbox.nmblookup" dc $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP" 
  plantest "blackbox.nmblookup" member $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
- plantest "blackbox.locktest" dc $bbdir/test_locktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
- plantest "blackbox.masktest" dc $bbdir/test_masktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
- plantest "blackbox.gentest" dc $bbdir/test_gentest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
+ plantest "blackbox.locktest" dc $samba4srcdir/torture/tests/test_locktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
+ plantest "blackbox.masktest" dc $samba4srcdir/torture/tests/test_masktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
+ plantest "blackbox.gentest" dc $samba4srcdir/torture/tests/test_gentest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
  plantest "blackbox.wbinfo" dc $samba4srcdir/nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$USERNAME" "\$PASSWORD" "dc"
  plantest "blackbox.wbinfo" member $samba4srcdir/nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$DC_USERNAME" "\$DC_PASSWORD" "member"
- plantest "blackbox.wintest" none $bbdir/test_wintest.sh "$TORTURE_OPTIONS"
  
  # Tests using the "Simple" NTVFS backend
  
@@@ -282,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 "$*"
@@@ -325,7 -334,7 +326,7 @@@ SUBUNITRUN="$PYTHON ./scripting/bin/sub
  plantest "ldb.python" none PYTHONPATH="$PYTHONPATH:lib/ldb/tests/python/" $SUBUNITRUN api
  plantest "credentials.python" none PYTHONPATH="$PYTHONPATH:auth/credentials/tests" $SUBUNITRUN bindings
  plantest "registry.python" none PYTHONPATH="$PYTHONPATH:lib/registry/tests/" $SUBUNITRUN bindings
- plantest "tdb.python" none PYTHONPATH="$PYTHONPATH:lib/tdb/python/tests" $SUBUNITRUN simple
+ plantest "tdb.python" none PYTHONPATH="$PYTHONPATH:../lib/tdb/python/tests" $SUBUNITRUN simple
  plantest "auth.python" none PYTHONPATH="$PYTHONPATH:auth/tests/" $SUBUNITRUN bindings
  plantest "security.python" none PYTHONPATH="$PYTHONPATH:libcli/security/tests" $SUBUNITRUN bindings
  plantest "param.python" none PYTHONPATH="$PYTHONPATH:param/tests" $SUBUNITRUN bindings
Unnamed repository; edit this file 'description' to name the repository.