summaryrefslogtreecommitdiff
path: root/source4/selftest/tests.sh
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-09-17 15:24:20 -0700
committerAndrew Tridgell <tridge@samba.org>2009-09-17 15:24:20 -0700
commit39971fff27f71b514308d10d7a2d8c3fb58c2420 (patch)
tree101f2adac9ef41af17579d22f6ddd56ada62ce5d /source4/selftest/tests.sh
parent23676b6e9e8aad0ac2aa78d04e65f637b4551527 (diff)
parente71d9728f52e969e07927c5b38fa062c6ef6d1eb (diff)
downloadsamba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.gz
samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.bz2
samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.zip
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source4/selftest/tests.sh')
-rwxr-xr-xsource4/selftest/tests.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index dd5bf6dfaf..4689b69c94 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -450,7 +450,8 @@ plantest "subunit.python" none $SUBUNITRUN subunit
plantest "rpcecho.python" dc:local $SUBUNITRUN samba.tests.rpcecho
plantest "winreg.python" dc:local $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.registry
plantest "ldap.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
-plantest "possibleInferiors.python" dc $PYTHON $samba4srcdir/dsdb/samdb/ldb_modules/tests/possibleinferiors.py $CONFIGURATION ldap://\$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
+plantest "ldap.possibleInferiors.python" dc $PYTHON $samba4srcdir/dsdb/samdb/ldb_modules/tests/possibleinferiors.py $CONFIGURATION ldap://\$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
+plantest "ldap.secdesc.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/sec_descriptor.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
plantest "blackbox.samba3dump" none $PYTHON $samba4srcdir/scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
rm -rf $PREFIX/upgrade
plantest "blackbox.upgrade" none $PYTHON $samba4srcdir/setup/upgrade $CONFIGURATION --targetdir=$PREFIX/upgrade $samba4srcdir/../testdata/samba3 ../testdata/samba3/smb.conf