svn commit: samba r26601 - in branches/SAMBA_4_0: . source/selftest

jelmer at samba.org jelmer at samba.org
Tue Dec 25 16:37:06 GMT 2007


Author: jelmer
Date: 2007-12-25 16:37:05 +0000 (Tue, 25 Dec 2007)
New Revision: 26601

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26601

Log:
Remove existing files to prevent errors.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/selftest/samba4_tests.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/selftest/samba4_tests.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/samba4_tests.sh	2007-12-25 16:37:02 UTC (rev 26600)
+++ branches/SAMBA_4_0/source/selftest/samba4_tests.sh	2007-12-25 16:37:05 UTC (rev 26601)
@@ -299,6 +299,8 @@
 	plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam
 	plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py \$SERVER -U\$USERNAME%\$PASSWORD
 	plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
-	plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf
+	rm -rf $PREFIX/upgrade
+	plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
+	rm -rf $PREFIX/provision
 	plantest "blackbox.provision.py" none $PYTHON ./setup/provision.py $CONFIGURATION --domain=FOO --realm=foo --targetdir=$PREFIX/provision
 fi



More information about the samba-cvs mailing list