diff options
author | Aditya Mandaleeka <adityam@microsoft.com> | 2015-09-15 15:51:16 -0700 |
---|---|---|
committer | Aditya Mandaleeka <adityam@microsoft.com> | 2015-09-15 15:51:16 -0700 |
commit | 2e7e7585ec51871856287681bf178f23822e46ea (patch) | |
tree | ed744de4b9f7abffd9aae024532c5c5fa1172dd1 /tests/runtest.proj | |
parent | 98c63c1612b2635a40d9a719c1505e0ad4bef08a (diff) | |
download | coreclr-2e7e7585ec51871856287681bf178f23822e46ea.tar.gz coreclr-2e7e7585ec51871856287681bf178f23822e46ea.tar.bz2 coreclr-2e7e7585ec51871856287681bf178f23822e46ea.zip |
Clean up some test scripts
Diffstat (limited to 'tests/runtest.proj')
-rw-r--r-- | tests/runtest.proj | 78 |
1 files changed, 37 insertions, 41 deletions
diff --git a/tests/runtest.proj b/tests/runtest.proj index 71549d1703..97ab648f73 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -13,45 +13,38 @@ <DisabledTestDir Include="Common" /> <_SkipTestDir Include="@(DisabledTestDir)" /> </ItemGroup> - - <Target Name="FindCmdDirectories" - DependsOnTargets="GetListOfTestCmds" - > + <Target Name="FindCmdDirectories" DependsOnTargets="GetListOfTestCmds"> <Error Condition="!Exists('$(XunitTestBinBase)')" - Text="$(XunitTestBinBase) does not exists. Please run buildtest.cmd from the (repo root)\tests at least once to get the tests built." /> - <ItemGroup> - - <AllTestDirsNonCanonicalPaths Include="$([System.IO.Directory]::GetDirectories(`$(XunitTestBinBase)`))" /> + Text="$(XunitTestBinBase) does not exist. Please run buildtest.cmd from the (repo root)\tests at least once to get the tests built." /> + + <ItemGroup> + <AllTestDirsNonCanonicalPaths Include="$([System.IO.Directory]::GetDirectories(`$(XunitTestBinBase)`))" /> <AllTestDirsPaths Include="@(AllTestDirsNonCanonicalPaths)" /> <AllTestDirsPaths Include="@(AllTestDirsNonCanonicalPaths)" > <Path>$([System.IO.Path]::GetFullPath(%(Identity)))</Path> </AllTestDirsPaths> - <NonExcludedTestDirectories Include="@(AllTestDirsPaths -> '%(Path)')" Exclude="@(_SkipTestDir -> '$(XunitTestBinBase)%(Identity)')"> <Path>$([System.IO.Path]::GetFullPath(%(AllRunnableTestPaths.Identity)))</Path> </NonExcludedTestDirectories> - <TestDirectoriesWithDup Include="@(NonExcludedTestDirectories -> '%(Identity)')" Condition="$([System.String]::new('%(Path)').StartsWith('%(Identity)'))" /> </ItemGroup> - <RemoveDuplicates - Inputs="@(TestDirectoriesWithDup)"> - <Output - TaskParameter="Filtered" - ItemName="TestDirectories"/> - </RemoveDuplicates> + <RemoveDuplicates Inputs="@(TestDirectoriesWithDup)"> + <Output + TaskParameter="Filtered" + ItemName="TestDirectories"/> + </RemoveDuplicates> + </Target> - <Import Project="$(__Exclude)" Condition="'$(__Exclude)' != '' AND '$(XunitTestBinBase)' != ''" /> - <Target Name="CreateXunitWrapper" - DependsOnTargets="CreateXunitFacts"> + <Target Name="CreateXunitWrapper" DependsOnTargets="CreateXunitFacts"> <PropertyGroup> <_XunitWrapperGen > @@ -143,11 +136,13 @@ $(_XunitEpilog) <!-- <Exec Command="md" --> <MakeDir Directories="$(XunitWrapperGeneratedCSDirBase)$(Category)"/> + <!-- Write the file --> <WriteLinesToFile File="$(XunitWrapperSrcDir)\$(XunitWrapper).cs" Lines="$(_XunitWrapperGen)" Overwrite="true" /> + <!-- Write the file --> <WriteLinesToFile File="$(XunitWrapperSrcDir)\$(XunitWrapper).csproj" @@ -160,11 +155,13 @@ $(_XunitEpilog) Lines="$(XunitWrapperGenPackConfig)" Overwrite="true" /> - <MSBuild Projects="$(XunitWrapperSrcDir)\$(XunitWrapper).csproj" /> + <MSBuild Projects="$(XunitWrapperSrcDir)\$(XunitWrapper).csproj" /> + </Target> + <Target Name="CreateXunitFacts"> <!-- NOTE! semicolons must be escaped with %3B boooo --> - + <PropertyGroup> <_CMDDIR_Parent>$([System.IO.Path]::GetDirectoryName($(_CMDDIR)))</_CMDDIR_Parent> <Category>$([System.String]::Copy('$(_CMDDIR)').Replace($(_CMDDIR_Parent)\,''))</Category> @@ -186,23 +183,24 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). ]]> </_XunitProlog> - <_XunitEpilog Condition=" '$(_XunitEpilog)'=='' "> + + <_XunitEpilog Condition=" '$(_XunitEpilog)'=='' "> <![CDATA[ } ]]> - </_XunitEpilog> + </_XunitEpilog> </PropertyGroup> <ItemGroup> - <CanonicalExcludeList Include="%(ExcludeList.FullPath)" Condition="'$(__Exclude)' != ''"/> + <CanonicalExcludeList Include="%(ExcludeList.FullPath)" Condition="'$(__Exclude)' != ''"/> </ItemGroup> <ItemGroup> - <AllCMDsPresent Include="$(_CMDDIR)\**\*.cmd" /> - <AllCMDExcludeFilter Include="@(CanonicalExcludeList)" Condition="'$(__Exclude)' != ''"/> - <AllCMDs Include="@(AllCMDsPresent)" Exclude="@(AllCMDExcludeFilter)"/> - + <AllCMDsPresent Include="$(_CMDDIR)\**\*.cmd" /> + <AllCMDExcludeFilter Include="@(CanonicalExcludeList)" Condition="'$(__Exclude)' != ''"/> + <AllCMDs Include="@(AllCMDsPresent)" Exclude="@(AllCMDExcludeFilter)"/> + <AllCommamds Include="@(AllCMDs)" > <_FactName>$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace(".","_"))</_FactName> @@ -285,7 +283,7 @@ public class $([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)" } } - + ]]> </_XunitFact> @@ -295,9 +293,7 @@ public class $([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)" </Target> - <Target Name="CreateAllWrappers" - DependsOnTargets="GetListOfTestCmds;FindCmdDirectories"> - + <Target Name="CreateAllWrappers" DependsOnTargets="GetListOfTestCmds;FindCmdDirectories"> <MSBuild Projects="$(MSBuildProjectFile)" Targets="CreateXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" /> </Target> @@ -306,26 +302,26 @@ public class $([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)" <AllRunnableTestPaths Include="$(XunitTestBinBase)\**\*.cmd" /> </ItemGroup> </Target> - + <Import Project="tests.targets" /> <Import Project="publishdependency.targets" /> - + <Target Name="Build"> <!-- Default for building --> <MSBuild Projects="$(MSBuildProjectFile)" - Targets="CreateAllWrappers" - Properties="_CMDDIR=%(TestDirectories.Identity)" - Condition=" '$(NoBuild)'!='true' " /> - + Targets="CreateAllWrappers" + Properties="_CMDDIR=%(TestDirectories.Identity)" + Condition=" '$(NoBuild)'!='true' " /> + <!-- Execution --> - + <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyDependecyToCoreRoot" Condition=" '$(NoRun)'!='true' "/> - + <MSBuild Projects="$(MSBuildProjectFile)" Targets="RunTests" Condition=" '$(NoRun)'!='true' "/> </Target> - + <Target Name="Clean"> <RemoveDir Condition=" '$(NoBuild)'!='true'" Directories="$(XunitWrapperGeneratedCSDirBase);$(XunitWrapperOutputIntermediatedDirBase)" ContinueOnError="WarnAndContinue" /> </Target> |