selftest: Remove output directories to save disk space

Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/setup/tests/blackbox_upgradeprovision.sh b/source4/setup/tests/blackbox_upgradeprovision.sh
index 8e4c2cc4f9e497b5f5db45b3cf23d4e01ad9d27e..85c085fc1c2657af9ffebd80afbfa117dd76a716 100755 (executable)
--- a/source4/setup/tests/blackbox_upgradeprovision.sh
+++ b/source4/setup/tests/blackbox_upgradeprovision.sh
@@ -57,6 +57,14 @@ ldapcmp_full_sd() {
         $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision_full/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --sd --skip-missing-dn
 }
 
+testit "upgradeprovision" upgradeprovision
+testit "upgradeprovision_full" upgradeprovision_full
+testit "upgradeprovision_reference" upgradeprovision_reference
+testit "ldapcmp" ldapcmp
+testit "ldapcmp_full" ldapcmp_full
+testit "ldapcmp_sd" ldapcmp_sd
+testit "ldapcmp_full_sd" ldapcmp_full_sd
+
 if [ -d $PREFIX/upgradeprovision ]; then
   rm -fr $PREFIX/upgradeprovision
 fi
@@ -65,12 +73,8 @@ if [ -d $PREFIX/upgradeprovision_full ]; then
   rm -fr $PREFIX/upgradeprovision_full
 fi
 
-testit "upgradeprovision" upgradeprovision
-testit "upgradeprovision_full" upgradeprovision_full
-testit "upgradeprovision_reference" upgradeprovision_reference
-testit "ldapcmp" ldapcmp
-testit "ldapcmp_full" ldapcmp_full
-testit "ldapcmp_sd" ldapcmp_sd
-testit "ldapcmp_full_sd" ldapcmp_full_sd
+if [ -d $PREFIX/upgradeprovision_reference ]; then
+  rm -fr $PREFIX/upgradeprovision_reference
+fi
 
 exit $failed

diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh
index 93565a1c1f6ecf618cbcb271fe428bd620d0985a..105483d70b4f363918b9aeed4bda3597ec2c1a44 100755 (executable)
--- a/testprogs/blackbox/upgradeprovision-oldrelease.sh
+++ b/testprogs/blackbox/upgradeprovision-oldrelease.sh
@@ -197,4 +197,16 @@ no test provision
 EOF
 fi
 
+if [ -d $PREFIX_ABS/${RELEASE}_upgrade ]; then
+  rm -fr $PREFIX_ABS/${RELEASE}_upgrade
+fi
+
+if [ -d $PREFIX_ABS/${RELEASE}_upgrade_full ]; then
+  rm -fr $PREFIX_ABS/${RELEASE}_upgrade_full
+fi
+
+if [ -d $PREFIX_ABS/${RELEASE}_upgrade_reference ]; then
+  rm -fr $PREFIX_ABS/${RELEASE}_upgrade_reference
+fi
+
 exit $failed