diff options
Diffstat (limited to 'tests/runtest.proj')
-rw-r--r-- | tests/runtest.proj | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/runtest.proj b/tests/runtest.proj index 45f2bb7702..58d3744a38 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -29,10 +29,13 @@ <AllTestDirsPaths Include="@(AllTestDirsNonCanonicalPaths)" > <Path>$([System.IO.Path]::GetFullPath(%(Identity)))</Path> </AllTestDirsPaths> - <NonExcludedTestDirectories Include="@(AllTestDirsPaths -> '%(Path)')" Exclude="@(_SkipTestDir -> '$(XunitTestBinBase)%(Identity)')"> + <NonExcludedTestDirectories Include="@(AllTestDirsPaths -> '%(Path)')" Exclude="@(_SkipTestDir -> '$(XunitTestBinBase)%(Identity)')" /> + <TopLevelDirectories Include="@(NonExcludedTestDirectories)" /> + <SecondLevel Include="$([System.IO.Directory]::GetDirectories(%(TopLevelDirectories.Identity)))" /> + <SecondLevelDirectories Include="@(SecondLevel)"> <Path>$([System.IO.Path]::GetFullPath(%(AllRunnableTestPaths.Identity)))</Path> - </NonExcludedTestDirectories> - <TestDirectoriesWithDup Include="@(NonExcludedTestDirectories -> '%(Identity)')" Condition="$([System.String]::new('%(Path)').StartsWith('%(Identity)'))" /> + </SecondLevelDirectories> + <TestDirectoriesWithDup Include="@(SecondLevelDirectories -> '%(Identity)')" Condition="$([System.String]::new('%(Path)').StartsWith('%(Identity)'))" /> </ItemGroup> @@ -79,11 +82,8 @@ $(_XunitEpilog) <TargetFrameworkVersion Condition ="'$(BuildTestsAgainstPackages)' != 'true'">v4.5</TargetFrameworkVersion> <IsXunitWrapperProject>true</IsXunitWrapperProject> <SkipSigning>true</SkipSigning> - <AppDesignerFolder>Properties</AppDesignerFolder> - <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="%24(SolutionDir) == '' Or %24(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> <CLRTestKind>BuildOnly</CLRTestKind> <IsTestProject>true</IsTestProject> <ProjectJson Condition="'$(BuildTestsAgainstPackages)' != 'true'">%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson> @@ -118,7 +118,7 @@ $(_XunitEpilog) </ItemGroup> <Import Project="$(SourceDir)dir.targets" /> <PropertyGroup> - <OutDir>$(XunitTestBinBase)\$(Category)\</OutDir> + <OutDir>$(XunitTestBinBase)\$(CategoryWithSlash)\</OutDir> </PropertyGroup> </Project> ]]> @@ -151,7 +151,9 @@ $(_XunitEpilog) <PropertyGroup> <_CMDDIR_Parent>$([System.IO.Path]::GetDirectoryName($(_CMDDIR)))</_CMDDIR_Parent> - <Category>$([System.String]::Copy('$(_CMDDIR)').Replace($(_CMDDIR_Parent)\,''))</Category> + <_CMDDIR_Grandparent>$([System.IO.Path]::GetDirectoryName($(_CMDDIR_Parent)))</_CMDDIR_Grandparent> + <CategoryWithSlash>$([System.String]::Copy('$(_CMDDIR)').Replace($(_CMDDIR_Grandparent)\,''))</CategoryWithSlash> + <Category>$([System.String]::Copy('$(CategoryWithSlash)').Replace('\','.'))</Category> <XunitWrapper>$(Category).XUnitWrapper</XunitWrapper> <XunitWrapperSrcDir>$(XunitWrapperGeneratedCSDirBase)$(Category)</XunitWrapperSrcDir> <XunitWrapperOutputDir>$(XunitWrapperOutputIntermediatedDirBase)$(Category)</XunitWrapperOutputDir> @@ -435,4 +437,4 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <Target Name="Clean"> <RemoveDir Condition=" '$(BuildWrappers)'=='true'" Directories="$(XunitWrapperGeneratedCSDirBase);$(XunitWrapperOutputIntermediatedDirBase)" ContinueOnError="WarnAndContinue" /> </Target> -</Project> +</Project>
\ No newline at end of file |