From 2cadfe8f2a3c0a4cf200288f0b6123eca866c510 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Sat, 14 Aug 2010 18:51:55 +0400 Subject: unit tests: debug to ease locating pb, remove dir if exists to avoid error --- source4/setup/tests/blackbox_upgradeprovision.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source4/setup/tests') diff --git a/source4/setup/tests/blackbox_upgradeprovision.sh b/source4/setup/tests/blackbox_upgradeprovision.sh index c1d3e46d81..f32d71de93 100755 --- a/source4/setup/tests/blackbox_upgradeprovision.sh +++ b/source4/setup/tests/blackbox_upgradeprovision.sh @@ -13,13 +13,19 @@ shift 1 . `dirname $0`/../../../testprogs/blackbox/subunit.sh upgradeprovision() { + if [ -d $PREFIX/upgradeprovision ]; then + rm -fr $PREFIX/upgradeprovision + fi $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision" --server-role="dc" - $PYTHON ./scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision/etc/smb.conf" + $PYTHON ./scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision/etc/smb.conf" --debugchange } upgradeprovision_full() { + if [ -d $PREFIX/upgradeprovision_full ]; then + rm -fr $PREFIX/upgradeprovision_full + fi $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_full" --server-role="dc" - $PYTHON ./scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision_full/etc/smb.conf" --full + $PYTHON ./scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange } testit "upgradeprovision" upgradeprovision -- cgit