From f0e0ebc0624e690dcebd0f3d31b36daf7750c295 Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Fri, 23 Oct 2015 14:39:25 -0700 Subject: Test Cleanup: 1. Ensures each test has its own unique directory 2. Use Project Reference to refer native CMakeLists.txt 3. Avoids copying the facades to the test build --- tests/issues.targets | 5 +---- .../ReversePInvoke/Marshalling/MarshalBoolArray.csproj | 5 ++--- tests/src/Loader/NativeLibs/FromNativePaths.csproj | 3 ++- tests/src/dir.common.props | 2 +- tests/src/dir.targets | 18 ++++++++++++++---- 5 files changed, 20 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/issues.targets b/tests/issues.targets index 3f228860a6..2bb667d851 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -1,10 +1,7 @@ - - 1036 - - + 1037 diff --git a/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.csproj b/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.csproj index 701e87c528..71b516610d 100644 --- a/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.csproj +++ b/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.csproj @@ -41,8 +41,7 @@ {c8c0dc74-fac4-45b1-81fe-70c4808366e0} CoreCLRTestLibrary - - + - \ No newline at end of file + diff --git a/tests/src/Loader/NativeLibs/FromNativePaths.csproj b/tests/src/Loader/NativeLibs/FromNativePaths.csproj index 163b1cde90..ebfbdb352c 100644 --- a/tests/src/Loader/NativeLibs/FromNativePaths.csproj +++ b/tests/src/Loader/NativeLibs/FromNativePaths.csproj @@ -19,6 +19,7 @@ + - \ No newline at end of file + diff --git a/tests/src/dir.common.props b/tests/src/dir.common.props index 39ce2c8d07..4f332e41d4 100644 --- a/tests/src/dir.common.props +++ b/tests/src/dir.common.props @@ -36,7 +36,7 @@ $(__ManagedTestIntermediatesDir)\ <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\$(BuildOS).$(Platform).$(Configuration)\)) $(MSBuildProjectName)\ - $([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(SourceDir),'')) + $([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(SourceDir),''))\$(MSBuildProjectName) $(BaseIntermediateOutputPath)$(BuildProjectRelativeDir) $(BaseOutputPathWithConfig)$(BuildProjectRelativeDir)\ diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 8579131257..20ce3fe066 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -134,19 +134,29 @@ - - - + + + $(PrepareForRunDependsOn);ResetReferenceCopyLocalPaths + + + + + + + + -- cgit v1.2.3