[OSSTEST PATCH 04/13] building: Delete when cloning, not when preparing $builddir

[Ian Jackson <ian.jackson@eu.citrix.com>]

Make prepbuilddirs no longer delete $builddir; instead:
 - have prepbuilddirs delete *-stamp files and dist/;
 - have build_clone delete the specific source directories;
 - any individual ts-*-build scripts that use other things
   would have to delete them (but searching for $builddir
   reveals none).

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Osstest/BuildSupport.pm |    2 +-
 Osstest/TestSupport.pm  |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Osstest/BuildSupport.pm b/Osstest/BuildSupport.pm
index 0938810..874e27e 100644
--- a/Osstest/BuildSupport.pm
+++ b/Osstest/BuildSupport.pm
@@ -74,7 +74,7 @@ sub builddirsprops {
 
 sub prepbuilddirs {
     my (@xbuilddirs) = @_;
-    my $cmd = "rm -rf $builddir && mkdir $builddir";
+    my $cmd = "mkdir -p $builddir && rm -rf $builddir/*-stamp $builddir/dist";
     $cmd .= " && mkdir $builddir/$_" foreach @xbuilddirs;
     target_cmd($ho,$cmd,600);
 }
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 22dcbff..3930595 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1061,9 +1061,12 @@ sub build_clone ($$$$) {
 	}
     }
 
+    my $rm = "rm -rf $subdir";
+
     if ($vcs eq 'hg') {
         
         target_cmd_build($ho, $timeout, $builddir, <<END.
+	    $rm
 	    hg clone '$tree' $subdir
 	    cd $subdir
 END
@@ -1075,6 +1078,7 @@ END
 	my $eff_tree = git_massage_url($tree);
 
         target_cmd_build($ho, $timeout, $builddir, <<END.
+            $rm
             git clone '$eff_tree' $subdir
             cd $subdir
 END
-- 
1.7.10.4