Only clean previous output for the selected configuration.

This modifies the `build.cmd`, `build.sh`, and `buildtest.cmd` to only
remove previous output (binaries, intermediates, and logs) for the
selected configuration when the `clean` argument is specified.

This also modifies `runtest.cmd` to output log files in the same format
as `build.cmd`, `build.sh`, and `buildtest.cmd` do currently.

1 files changed, 9 insertions, 2 deletions

diff --git a/build.sh b/build.sh
index 6ca9e7c7d0..fe5577cba4 100755
--- a/build.sh
+++ b/build.sh
@@ -26,8 +26,14 @@ setup_dirs()
 
 clean()
 {
-    echo Cleaning binaries directory
-    rm -rf "$__RootBinDir"
+    echo Cleaning previous output for the selected configuration
+    rm -rf "$__BinDir"
+    rm -rf "$__IntermediatesDir"
+	
+    rm -rf "$__TestWorkingDir"
+    rm -rf "$__TestIntermediatesDir"
+	
+    rm -rf "$__LogsDir/*_$__BuildOS__$__BuildArch__$__BuildType.*"
 }
 
 # Check the system to ensure the right pre-reqs are in place
@@ -187,6 +193,7 @@ __PackagesBinDir="$__BinDir/.nuget"
 __ToolsDir="$__RootBinDir/tools"
 __TestWorkingDir="$__RootBinDir/tests/$__BuildOS.$__BuildArch.$__BuildType"
 __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
+__TestIntermediatesDir="$__RootBinDir/tests/obj/$__BuildOS.$__BuildArch.$__BuildType"
 
 # Specify path to be set for CMAKE_INSTALL_PREFIX.
 # This is where all built CoreClr libraries will copied to.