From 535a9b31331c8f0741c786616f9be034abba8e08 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Fri, 20 May 2011 20:45:43 +0400 Subject: Make the purge first so that the provision can reused during tests --- source4/setup/tests/blackbox_upgradeprovision.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/setup/tests') diff --git a/source4/setup/tests/blackbox_upgradeprovision.sh b/source4/setup/tests/blackbox_upgradeprovision.sh index 05b155d521..6d26105b45 100755 --- a/source4/setup/tests/blackbox_upgradeprovision.sh +++ b/source4/setup/tests/blackbox_upgradeprovision.sh @@ -28,9 +28,6 @@ upgradeprovision_full() { $PYTHON $SRCDIR/source4/scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange } -testit "upgradeprovision" upgradeprovision -testit "upgradeprovision_full" upgradeprovision_full - if [ -d $PREFIX/upgradeprovision ]; then rm -fr $PREFIX/upgradeprovision fi @@ -39,4 +36,7 @@ if [ -d $PREFIX/upgradeprovision_full ]; then rm -fr $PREFIX/upgradeprovision_full fi +testit "upgradeprovision" upgradeprovision +testit "upgradeprovision_full" upgradeprovision_full + exit $failed -- cgit