summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-05-20 20:45:43 +0400
committerMatthieu Patou <mat@samba.org>2011-05-21 08:41:07 +0200
commit535a9b31331c8f0741c786616f9be034abba8e08 (patch)
treeb084158c73f796ae02b78cec90e164f761cf81ac
parenta0db60d3eabc309c3e65915b00e023acd9a13897 (diff)
downloadsamba-535a9b31331c8f0741c786616f9be034abba8e08.tar.gz
samba-535a9b31331c8f0741c786616f9be034abba8e08.tar.bz2
samba-535a9b31331c8f0741c786616f9be034abba8e08.zip
Make the purge first so that the provision can reused during tests
-rwxr-xr-xsource4/setup/tests/blackbox_upgradeprovision.sh6
1 files changed, 3 insertions, 3 deletions
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