Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest

Conflicts:
	selftest/selftest.pl

diff --cc selftest/output/plain.pm
Simple merge

diff --cc selftest/selftest.pl
index 84b2f52058df1be2401efee325bfe11ac0679fdf,92aa67e8d3e2f74a68c6a1ab3b05a59f769fedb7..1477d10d469bb590bb6ed4dfc552f2a54cdd9389
--- 1/selftest/selftest.pl
--- 2/source4/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@@ -416,10 -416,8 +416,8 @@@ sub prefix_pathvar($$
                $ENV{$name} = $newpath;
        }
  }
 -prefix_pathvar("PKG_CONFIG_PATH", "$old_pwd/bin/pkgconfig");
 -prefix_pathvar("PYTHONPATH", "$old_pwd/bin/python");
 +prefix_pathvar("PKG_CONFIG_PATH", "$old_pwd/source4/bin/pkgconfig");
- # Required for smbscript:
- prefix_pathvar("PATH", "$old_pwd/source4/bin");
 +prefix_pathvar("PYTHONPATH", "$old_pwd/source4/bin/python");
  
  if ($opt_socket_wrapper_keep_pcap) {
        # Socket wrapper keep pcap implies socket wrapper pcap

diff --cc selftest/target/Samba4.pm
Simple merge

diff --cc source4/Makefile
Simple merge

diff --cc source4/selftest/config.mk
Simple merge

diff --cc source4/selftest/quick
Simple merge

diff --cc source4/selftest/skip
Simple merge

diff --cc source4/selftest/tests.sh
index eff06f588e0adb4788298ccd6a11c5c5cfa0e657,9fc71a104f4006199d3ed17602aadcf67a1635c3..fa799f51ffde2ef12977db2a75256f3db9dd17d8
--- 1/source4/selftest/tests.sh
--- 2/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/tests.sh
@@@ -54,16 -56,12 +54,12 @@@ plansmbtorturetest() 
        plantest "$modname" "$env" $cmdline
  }
  
 -$incdir/../bin/smbtorture -V
 +bin/smbtorture -V
  
 -samba4srcdir=$incdir/..
 +samba4srcdir=.
  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,9 -263,9 +261,9 @@@ f
  # the API. These mainly test that the various command-line options of commands 
  # work correctly.
  
 -bbdir=$incdir/../../testprogs/blackbox
 +bbdir=../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"