Move setup code to a function and introduce matching cleanup argument

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>

test

@@ -68,6 +68,7 @@ cleanup() {
 	done
 }
 
+do_setup() {
   trap cleanup 0 1 2 3 15
 
   devlist=
@@ -95,6 +96,7 @@ ulimit -c unlimited
   [ -f /proc/mdstat ] || modprobe md_mod
   echo 2000 > /proc/sys/dev/raid/speed_limit_max
   echo 0 > /sys/module/md_mod/parameters/start_ro
+}
 
 # mdadm always adds --quiet, and we want to see any unexpected messages
 mdadm() {
@@ -246,6 +248,7 @@ do_help() {
   echo "    --save-logs                 Save all logs in <logdir>"
   echo "    --no-error                  Don't stop on error, ie. run all tests"
   echo "    setup                       Setup test environment and exit"
+  echo "    cleanup                     Cleanup test environment"
   echo "    <prefix>                    Run tests with <prefix>"
 }
 
@@ -258,8 +261,13 @@ parse_args() {
       ;;
     setup)
       echo "mdadm test environment setup"
+      do_setup
       trap 0; exit 0
       ;;
+    cleanup)
+      cleanup
+      exit 0
+      ;;
     --tests=*)
       TESTLIST=`expr "x$i" : 'x[^=]*=\(.*\)' | sed -e 's/,/ /g'`
       ;;
@@ -296,6 +304,8 @@ done
 
 parse_args $@
 
+do_setup
+
 if [ "$savelogs" == "1" ]; then
   echo "Saving logs to $logdir"
 fi