Changes to Miscellaneous test project and runtest

16 files changed, 47 insertions, 98 deletions

diff --git a/tests/buildtest.cmd b/tests/buildtest.cmd
index f320aa1f0f..e359d991fb 100644
--- a/tests/buildtest.cmd
+++ b/tests/buildtest.cmd
@@ -21,7 +21,7 @@ if not defined __BuildArch set __BuildArch=x64
 if not defined __BuildType set __BuildType=debug
 if not defined __TestWorkingDir set __TestWorkingDir=%__ProjectFilesDir%\..\binaries\tests\%__BuildArch%\%__BuildType%
 
-if not defined __LogsDir set  __LogsDir=%__ProjectFilesDir%
+if not defined __LogsDir        set  __LogsDir=%__ProjectFilesDir%..\binaries\Logs\
 
 set __TestBuildLog=%__LogsDir%\Tests_%__BuildArch%__%__BuildType%.log
 set __XunitWrapperBuildLog=%__LogsDir%\Tests_XunitWrapper_%__BuildArch%__%__BuildType%.log
diff --git a/tests/runtest.cmd b/tests/runtest.cmd
index 9e294ee63b..5e9495dfa9 100644
--- a/tests/runtest.cmd
+++ b/tests/runtest.cmd
@@ -7,12 +7,12 @@ if /i "%1" == "x64"    (set __BuildArch=x64&set __MSBuildBuildArch=x64&shift&got
 
 if /i "%1" == "debug"    (set __BuildType=debug&shift&goto Arg_Loop)
 if /i "%1" == "release"   (set __BuildType=release&shift&goto Arg_Loop)
-if /i "%1" == "SkipWrapperGeneration" (set __SkipWrapperGeneration=yes&shift&goto Arg_Loop)
+if /i "%1" == "SkipWrapperGeneration" (set __SkipWrapperGeneration=true&shift&goto Arg_Loop)
 
 if /i "%1" == "/?"      (goto Usage)
 
 set Core_Root=%1
-
+shift 
 :ArgsDone
 :: Check prerequisites
 
@@ -38,7 +38,7 @@ if not defined __BuildArch set __BuildArch=x64
 if not defined __BuildType set __BuildType=debug
 if not defined __BinDir    set  __BinDir=%__ProjectFilesDir%..\binaries\Product\%__BuildArch%\%__BuildType%
 if not defined __TestWorkingDir set __TestWorkingDir=%__ProjectFilesDir%..\binaries\tests\%__BuildArch%\%__BuildType%
-if not defined __LogsDir        set  __LogsDir=%CD%
+if not defined __LogsDir        set  __LogsDir=%__ProjectFilesDir%..\binaries\Logs\
 
 :: Default global test environmet variables
 if not defined XunitTestBinBase       set  XunitTestBinBase=%__TestWorkingDir%\
@@ -53,15 +53,17 @@ set Core_Root=%__BinDir%
 if not exist %XunitTestBinBase% echo Error: Ensure the Test Binaries are built and are present at %XunitTestBinBase%, Run - buildtest.cmd %__BuildArch% %__BuildType% to build the tests first. && exit /b 1
 if "%Core_Root%" == ""             echo Error: Ensure you have done a successful build of the Product and Run - runtest BuildArch BuildType {path to product binaries}. && exit /b 1
 if not exist %Core_Root%\coreclr.dll echo Error: Ensure you have done a successful build of the Product and %Core_Root% contains runtime binaries. && exit /b 1
-
+if not exist %__LogsDir%           md  %__LogsDir%
 
 :SkipDefaultCoreRootSetup
 set __XunitWrapperBuildLog=%__LogsDir%\Tests_XunitWrapper_%__BuildArch%__%__BuildType%.log
 set __TestRunBuildLog=%__LogsDir%\TestRunResults_%__BuildArch%__%__BuildType%.log
-set __TestRunHtmlLog=%__LogsDir%\\TestRun_%__BuildArch%__%__BuildType%.html
+set __TestRunHtmlLog=%CD%\TestRun_%__BuildArch%__%__BuildType%.html
 
-echo "Core_Root to be used will be %Core_Root%"
+echo "Core_Root that will be used is : %Core_Root%"
 echo "Starting The Test Run .. "
+if  "%__SkipWrapperGeneration%"=="true" goto :preptests
+
 :: Log build command line
 set _buildprefix=echo
 set _buildpostfix=^> "%__TestRunBuildLog%"
@@ -74,28 +76,51 @@ set _buildpostfix=
 set _buildappend=
 call :PerformXunitWrapperBuild 
 
+IF %BUILDERRORLEVEL% NEQ 0 echo XunitWrapperBuild build failed. Refer %__XunitWrapperBuildLog% for details. && exit /b %BUILDERRORLEVEL%
+
+call :preptests
 goto :eof
 
 :PerformXunitWrapperBuild
-if  "%__SkipWrapperGeneration%"=="true" goto :preptests
 
-%_buildprefix% %_msbuildexe% "%__ProjectFilesDir%runtest.proj" /p:NoRun=true /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=diag;LogFile="%__XunitWrapperBuildLog%";Append %* %_buildappend%%_buildpostfix%
+%_buildprefix% %_msbuildexe% "%__ProjectFilesDir%runtest.proj" /p:NoRun=true /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=diag;LogFile="%__XunitWrapperBuildLog%";Append %1  %_buildappend%%_buildpostfix%
+
+set BUILDERRORLEVEL=%ERRORLEVEL%
+
+goto :eof
 
-IF  ERRORLEVEL 1 echo XunitWrapperBuild build failed. Refer %__XunitWrapperBuildLog% for details. && exit /b 1
 :preptests
-%_buildprefix% if not "%noCore_RootSet%"=="true" goto :runtests %_buildpostfix%
-%_buildprefix% set Core_Root=%XunitTestBinBase%\Tests\Core_Root %_buildpostfix%
-%_buildprefix% rd /s /q %Core_Root% %_buildpostfix%
-%_buildprefix% md %Core_Root% %_buildpostfix%
-%_buildprefix% echo d | xcopy /s %__BinDir% %Core_Root% %_buildpostfix%
+:: Log build command line
+set _buildprefix=echo
+set _buildpostfix=^> "%__TestRunBuildLog%"
+set _buildappend=^>
+call :runtests 
+
+:: Build
+set _buildprefix=
+set _buildpostfix=
+set _buildappend=
+if not "%noCore_RootSet%"=="true" goto :runtests 
+set Core_Root=%XunitTestBinBase%\Tests\Core_Root
+echo "Using Default Core_Root as %Core_Root% " 
+echo "Copying Built binaries from  %__BinDir% to %Core_Root%"
+if exist %Core_Root% rd /s /q %Core_Root%
+md %Core_Root%
+echo d | xcopy /s %__BinDir% %Core_Root%
+call :runtests 
+
+IF %BUILDERRORLEVEL% NEQ 0 echo Test Run  failed. Refer %__TestRunBuildLog% for details. && exit /b %BUILDERRORLEVEL%
+goto :eof
 
 :runtests
-%_buildprefix% %_msbuildexe% "%__ProjectFilesDir%runtest.proj" /p:NoBuild=true /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=diag;LogFile="%__TestRunBuildLog%";Append %* %_buildpostfix%
+%_buildprefix% %_msbuildexe% "%__ProjectFilesDir%runtest.proj" /p:NoBuild=true /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=diag;LogFile="%__TestRunBuildLog%";Append %1 %_buildpostfix%
+
+set BUILDERRORLEVEL=%ERRORLEVEL%
+goto :eof
 
 %_buildprefix% echo "Core_Root that was used is %Core_Root%" %_buildpostfix%
 echo "Find details of the run in %__TestRunHtmlLog%
 
-IF  ERRORLEVEL 1 echo Test Run  failed. Refer %__TestRunBuildLog% for details. && exit /b 1
 
 goto :eof
 
@@ -109,3 +134,4 @@ echo BuildType can be: Debug, Release
 echo SkipWrapperGeneration- Optional parameter this will run the same set of tests as the last time it was run
 echo CORE_ROOT The path to the runtime  
 goto :eof
+
diff --git a/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
index 172c061a9c..0f5b8055fa 100644
--- a/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
+++ b/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
@@ -46,9 +46,4 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
index 1005ed180e..d25b55987b 100644
--- a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
+++ b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
@@ -37,9 +37,4 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
 </Project>
diff --git a/tests/src/Exceptions/Finalization/Finalizer.csproj b/tests/src/Exceptions/Finalization/Finalizer.csproj
index e08d482a9c..b4b266a02b 100644
--- a/tests/src/Exceptions/Finalization/Finalizer.csproj
+++ b/tests/src/Exceptions/Finalization/Finalizer.csproj
@@ -37,9 +37,4 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/src/JIT/CodeGenBringUpTests/cs_template.proj b/tests/src/JIT/CodeGenBringUpTests/cs_template.proj
index 24e175c812..93788b357b 100644
--- a/tests/src/JIT/CodeGenBringUpTests/cs_template.proj
+++ b/tests/src/JIT/CodeGenBringUpTests/cs_template.proj
@@ -38,10 +38,4 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-  
 </Project>
diff --git a/tests/src/JIT/Directed/Arrays/cs_template.proj b/tests/src/JIT/Directed/Arrays/cs_template.proj
index 24e175c812..93788b357b 100644
--- a/tests/src/JIT/Directed/Arrays/cs_template.proj
+++ b/tests/src/JIT/Directed/Arrays/cs_template.proj
@@ -38,10 +38,4 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-  
 </Project>
diff --git a/tests/src/Loader/regressions/classloader-generics/cs_template.proj b/tests/src/Loader/regressions/classloader-generics/cs_template.proj
index 24e175c812..93788b357b 100644
--- a/tests/src/Loader/regressions/classloader-generics/cs_template.proj
+++ b/tests/src/Loader/regressions/classloader-generics/cs_template.proj
@@ -38,10 +38,4 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-  
 </Project>
diff --git a/tests/src/Loader/regressions/classloader/cs_template.proj b/tests/src/Loader/regressions/classloader/cs_template.proj
index 24e175c812..93788b357b 100644
--- a/tests/src/Loader/regressions/classloader/cs_template.proj
+++ b/tests/src/Loader/regressions/classloader/cs_template.proj
@@ -38,10 +38,4 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-  
 </Project>
diff --git a/tests/src/Loader/regressions/polyrec/Polyrec.csproj b/tests/src/Loader/regressions/polyrec/Polyrec.csproj
index 824686b119..44b19866e5 100644
--- a/tests/src/Loader/regressions/polyrec/Polyrec.csproj
+++ b/tests/src/Loader/regressions/polyrec/Polyrec.csproj
@@ -38,9 +38,4 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
 </Project>
diff --git a/tests/src/Loader/typeinitialization/cs_template.proj b/tests/src/Loader/typeinitialization/cs_template.proj
index 24e175c812..93788b357b 100644
--- a/tests/src/Loader/typeinitialization/cs_template.proj
+++ b/tests/src/Loader/typeinitialization/cs_template.proj
@@ -38,10 +38,4 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-  
 </Project>
diff --git a/tests/src/Regressions/assemblyref/assem.csproj b/tests/src/Regressions/assemblyref/assem.csproj
index cbb8464c7a..7c7c160453 100644
--- a/tests/src/Regressions/assemblyref/assem.csproj
+++ b/tests/src/Regressions/assemblyref/assem.csproj
@@ -38,9 +38,4 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/src/Regressions/assemblyref/test.csproj b/tests/src/Regressions/assemblyref/test.csproj
index 7bb22f9b92..c5b217932a 100644
--- a/tests/src/Regressions/assemblyref/test.csproj
+++ b/tests/src/Regressions/assemblyref/test.csproj
@@ -43,9 +43,4 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
 </Project>
diff --git a/tests/src/Regressions/common/cs_template.proj b/tests/src/Regressions/common/cs_template.proj
index 8332e62030..4acc74c2e0 100644
--- a/tests/src/Regressions/common/cs_template.proj
+++ b/tests/src/Regressions/common/cs_template.proj
@@ -43,10 +43,4 @@
     </ProjectReference> 
 
   </ItemGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-  
 </Project>
diff --git a/tests/src/Regressions/expl_double/expl_double.csproj b/tests/src/Regressions/expl_double/expl_double.csproj
index 4e61a6b4e8..74a0e29f2b 100644
--- a/tests/src/Regressions/expl_double/expl_double.csproj
+++ b/tests/src/Regressions/expl_double/expl_double.csproj
@@ -36,9 +36,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/src/Threading/ThreadStatics/cs_template.proj b/tests/src/Threading/ThreadStatics/cs_template.proj
index 24e175c812..93788b357b 100644
--- a/tests/src/Threading/ThreadStatics/cs_template.proj
+++ b/tests/src/Threading/ThreadStatics/cs_template.proj
@@ -38,10 +38,4 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
-  
 </Project>