Use -f instead of -n when copying from Core_Root in runtest.sh

Commit migrated from https://github.com/dotnet/coreclr/commit/3eab59fc71cf9fc99f0d555d41974e310465c54b

diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh
index 9b83718..ee2b3b9 100755 (executable)
--- a/src/coreclr/tests/runtest.sh
+++ b/src/coreclr/tests/runtest.sh
@@ -368,7 +368,8 @@ function create_core_overlay {
     if [ -d "$mscorlibDir/bin" ]; then
         cp -f -v "$mscorlibDir/bin/"* "$coreOverlayDir/" 2>/dev/null
     fi
-    cp -n -v "$testDependenciesDir"/* "$coreOverlayDir/" 2>/dev/null
+    cp -f -v "$testDependenciesDir/"xunit* "$coreOverlayDir/" 2>/dev/null
+    cp -n -v "$testDependenciesDir/"* "$coreOverlayDir/" 2>/dev/null
     if [ -f "$coreOverlayDir/mscorlib.ni.dll" ]; then
         # Test dependencies come from a Windows build, and mscorlib.ni.dll would be the one from Windows
         rm -f "$coreOverlayDir/mscorlib.ni.dll"

diff --git a/src/coreclr/tests/src/dirs.proj b/src/coreclr/tests/src/dirs.proj
index 4d85366..5314c27 100644 (file)
--- a/src/coreclr/tests/src/dirs.proj
+++ b/src/coreclr/tests/src/dirs.proj
@@ -26,8 +26,6 @@
       <DisabledProjects Include="JIT\superpmi\superpmicollect.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'" />
       <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 -->
-      <DisabledProjects Include="JIT\Performance\CodeQuality\Serialization\Deserialize.csproj" /> <!-- issue 9733 -->
-      <DisabledProjects Include="JIT\Performance\CodeQuality\Serialization\Serialize.csproj" /> <!-- issue 9733 -->
     </ItemGroup>
     
     <ItemGroup>