diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-25 16:36:31 -0600 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-26 11:57:07 -0600 |
commit | 7c146c42d2cf51e891b9f29d3b61a40f173a3b23 (patch) | |
tree | b4484d79dfbaa433f5712f9b15a2ae1d00299357 /source4/selftest | |
parent | cc30cb5e24160d107b67936d71f54645d9b3d23f (diff) | |
download | samba-7c146c42d2cf51e891b9f29d3b61a40f173a3b23.tar.gz samba-7c146c42d2cf51e891b9f29d3b61a40f173a3b23.tar.bz2 samba-7c146c42d2cf51e891b9f29d3b61a40f173a3b23.zip |
r26593: - More work on the python versions of samba3dump and the samba3sam tests.
- Initial work converting the upgrade code to Python.
- Removed the old EJS upgrade code because it has been broken for a long time.
(This used to be commit 150cf39fbd4fe088546870fb0d8f20c0d9eb4aca)
Diffstat (limited to 'source4/selftest')
-rwxr-xr-x | source4/selftest/samba4_tests.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index edcf51a8e0..59c7635c19 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -241,10 +241,6 @@ DATADIR=$samba4srcdir/../testdata plantest "parse samba3" none $samba4bindir/smbscript $DATADIR/samba3/verify $CONFIGURATION $DATADIR/samba3 plantest "js.samba3sam" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/ -rm -rf $PREFIX/upgrade -mkdir -p $PREFIX/upgrade -#plantest "upgrade" none $samba4bindir/smbscript setup/upgrade $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf - # Domain Member Tests plantest "RPC-ECHO against member server with local creds" member $VALGRIND $smb4torture ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" RPC-ECHO "$*" @@ -301,4 +297,7 @@ then plantest "samba3.python" none PYTHONPATH=bin/python:scripting/python $PYTHON scripting/bin/subunitrun samba.tests.samba3 plantest "samba3sam.python" none PYTHONPATH=bin/python:scripting/python $PYTHON dsdb/samdb/ldb_modules/tests/samba3sam.py `pwd` $DATADIR/samba3/ plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py \$SERVER -U\$USERNAME%\$PASSWORD + rm -rf $PREFIX/upgrade + mkdir -p $PREFIX/upgrade + plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf fi |