Skip to content

Commit 65b2fa4

Browse files
stgatesstgates
committed
Adding all tests except for websockets for Windows UAP.
1 parent bd9134a commit 65b2fa4

File tree

56 files changed

+1620
-2293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1620
-2293
lines changed

‎Release/tests/common/TestRunner/dirs.proj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
<ProjectFile Include="vs14.android\TestRunner.android.NativeActivity\TestRunner.android.NativeActivity.vcxproj" Condition="'$(Platform)'!='x64'" />
1616
<ProjectFile Include="vs14.android\TestRunner.android.Packaging\TestRunner.android.Packaging.androidproj" Condition="'$(Platform)'!='x64'" />
1717
</ItemGroup>
18+
19+
<ItemGroup Condition="'$(OsVersion)|'$(DevToolsVersion)'=='6.3|140'">
20+
<ProjectFile Include="vs14.uap\TestRunner140.uap.vcxproj" />
21+
</ItemGroup>
1822

1923
<Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
2024

‎Release/tests/common/TestRunner/vs14.uap/TestRunner140.uap.vcxproj

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|Win32">
9+
<Configuration>Debug</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|ARM">
17+
<Configuration>Release</Configuration>
18+
<Platform>ARM</Platform>
19+
</ProjectConfiguration>
20+
<ProjectConfiguration Include="Release|Win32">
21+
<Configuration>Release</Configuration>
22+
<Platform>Win32</Platform>
23+
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|x64">
25+
<Configuration>Release</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
28+
</ItemGroup>
29+
<PropertyGroup Label="Globals">
30+
<ProjectGuid>{5E421824-72D7-4482-A161-8D7D02308E52}</ProjectGuid>
31+
<Keyword>Win32Proj</Keyword>
32+
<SccProjectName>SAK</SccProjectName>
33+
<SccAuxPath>SAK</SccAuxPath>
34+
<SccLocalPath>SAK</SccLocalPath>
35+
<SccProvider>SAK</SccProvider>
36+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
37+
<PlatformToolset>v140</PlatformToolset>
38+
<CharacterSet>Unicode</CharacterSet>
39+
<ConfigurationType>Application</ConfigurationType>
40+
</PropertyGroup>
41+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
42+
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
43+
<UseDebugLibraries>true</UseDebugLibraries>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
46+
<UseDebugLibraries>false</UseDebugLibraries>
47+
<WholeProgramOptimization>true</WholeProgramOptimization>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
50+
<UseDebugLibraries>false</UseDebugLibraries>
51+
<WholeProgramOptimization>true</WholeProgramOptimization>
52+
</PropertyGroup>
53+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
54+
<UseDebugLibraries>false</UseDebugLibraries>
55+
<WholeProgramOptimization>true</WholeProgramOptimization>
56+
</PropertyGroup>
57+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
58+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Tests.Settings" />
59+
<ImportGroup Label="ExtensionSettings">
60+
</ImportGroup>
61+
<ImportGroup Label="PropertySheets">
62+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63+
</ImportGroup>
64+
<PropertyGroup Label="UserMacros" />
65+
<PropertyGroup>
66+
<TargetName>TestRunner.winrt</TargetName>
67+
</PropertyGroup>
68+
69+
<ItemDefinitionGroup>
70+
<ClCompile>
71+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
72+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
73+
<PreprocessorDefinitions>WINRT_TEST_RUNNER;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
74+
<MinimalRebuild>false</MinimalRebuild>
75+
</ClCompile>
76+
<Link>
77+
<SubSystem>Console</SubSystem>
78+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
79+
<GenerateDebugInformation>true</GenerateDebugInformation>
80+
</Link>
81+
</ItemDefinitionGroup>
82+
83+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
84+
<ClCompile>
85+
<Optimization>Disabled</Optimization>
86+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
87+
</ClCompile>
88+
</ItemDefinitionGroup>
89+
90+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
91+
<ClCompile>
92+
<Optimization>MaxSpeed</Optimization>
93+
<FunctionLevelLinking>true</FunctionLevelLinking>
94+
<IntrinsicFunctions>true</IntrinsicFunctions>
95+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
96+
</ClCompile>
97+
<Link>
98+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
99+
<OptimizeReferences>true</OptimizeReferences>
100+
</Link>
101+
</ItemDefinitionGroup>
102+
103+
<ItemGroup>
104+
<ClCompile Include="..\test_module_loader.cpp" />
105+
<ClCompile Include="..\test_runner.cpp" />
106+
</ItemGroup>
107+
<ItemGroup>
108+
<ClInclude Include="..\test_module_loader.h" />
109+
</ItemGroup>
110+
<ItemGroup>
111+
<ProjectReference Include="$(TestRoot)\Common\UnitTestpp\vs14.uap\UnitTestpp140.uap.vcxproj">
112+
<Project>{04214181-57D7-45F5-8499-1A5530CE6CBF}</Project>
113+
</ProjectReference>
114+
</ItemGroup>
115+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
116+
<ImportGroup Label="ExtensionTargets">
117+
</ImportGroup>
118+
</Project>

‎Release/tests/common/TestRunner/vs14.winrt/TestRunner140.winrt.vcxproj.filters renamed to ‎Release/tests/common/TestRunner/vs14.uap/TestRunner140.uap.vcxproj.filters

File renamed without changes.

‎Release/tests/common/TestRunner/vs14.winrt/TestRunner140.winrt.vcxproj

Lines changed: 0 additions & 250 deletions
This file was deleted.

‎Release/tests/common/UnitTestpp/dirs.proj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<ProjectFile Include="VS14\UnitTestpp140.vcxproj"/>
2222
<ProjectFile Include="VS14\TestUnitTestpp140.vcxproj"/>
2323
</ItemGroup>
24+
25+
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|140'">
26+
<ProjectFile Include="vs14.uap\UnitTestpp120.uap.vcxproj" />
27+
</ItemGroup>
2428

2529
<Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
2630

0 commit comments

Comments
 (0)