summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-25 16:37:05 -0600
committerStefan Metzmacher <metze@samba.org>2007-12-26 11:57:09 -0600
commit3a3633be8591fbc3219c7b220998f53009132a0a (patch)
tree1541d0cb87dda9ca0f0920730c29d719889cf89f
parent251a4e07803d0fa95b1324d60133475ef8c41e79 (diff)
downloadsamba-3a3633be8591fbc3219c7b220998f53009132a0a.tar.gz
samba-3a3633be8591fbc3219c7b220998f53009132a0a.tar.bz2
samba-3a3633be8591fbc3219c7b220998f53009132a0a.zip
r26601: Remove existing files to prevent errors.
(This used to be commit 9427757ae2ceba987883ed322eb49eac0be6c079)
-rwxr-xr-xsource4/selftest/samba4_tests.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 065a827e5b..cff868877a 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -299,6 +299,8 @@ then
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