Skip to content

Commit aaab7c2

Browse files
committed
Disabled test projects on x64 architecture
1 parent 12c054f commit aaab7c2

File tree

12 files changed

+13
-13
lines changed

12 files changed

+13
-13
lines changed

Release/tests/common/TestRunner/dirs.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
1414
<ProjectFile Include="VS14\TestRunner140.vcxproj" />
15-
<ProjectFile Include="vs14.android\TestRunner.android.NativeActivity\TestRunner.android.NativeActivity.vcxproj" />
16-
<ProjectFile Include="vs14.android\TestRunner.android.Packaging\TestRunner.android.Packaging.androidproj" />
15+
<ProjectFile Include="vs14.android\TestRunner.android.NativeActivity\TestRunner.android.NativeActivity.vcxproj" Condition="'$(Platform)'!='x64'" />
16+
<ProjectFile Include="vs14.android\TestRunner.android.Packaging\TestRunner.android.Packaging.androidproj" Condition="'$(Platform)'!='x64'" />
1717
</ItemGroup>
1818

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

Release/tests/common/UnitTestpp/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
20-
<ProjectFile Include="vs14.android\UnitTestpp140.android.vcxproj"/>
20+
<ProjectFile Include="vs14.android\UnitTestpp140.android.vcxproj" Condition="'$(Platform)'!='x64'" />
2121
<ProjectFile Include="VS14\UnitTestpp140.vcxproj"/>
2222
<ProjectFile Include="VS14\TestUnitTestpp140.vcxproj"/>
2323
</ItemGroup>

Release/tests/functional/http/client/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
2020
<ProjectFile Include="VS14\HttpClient140_test.vcxproj" />
21-
<ProjectFile Include="vs14.android\HttpClient140_test.android.vcxproj" />
21+
<ProjectFile Include="vs14.android\HttpClient140_test.android.vcxproj" Condition="'$(Platform)'!='x64'" />
2222
</ItemGroup>
2323

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

Release/tests/functional/http/utilities/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
2222
<ProjectFile Include="VS14\HttpTestUtilities140.vcxproj" />
23-
<ProjectFile Include="vs14.android\HttpTestUtilities140.android.vcxproj" />
23+
<ProjectFile Include="vs14.android\HttpTestUtilities140.android.vcxproj" Condition="'$(Platform)'!='x64'" />
2424
</ItemGroup>
2525

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

Release/tests/functional/json/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
2424
<ProjectFile Include="VS14\JSON140_test.vcxproj" />
25-
<ProjectFile Include="vs14.android\JSON140_test.android.vcxproj" />
25+
<ProjectFile Include="vs14.android\JSON140_test.android.vcxproj" Condition="'$(Platform)'!='x64'" />
2626
</ItemGroup>
2727

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

Release/tests/functional/misc/atl_headers/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
1414
<ProjectFile Include="VS14\header_test140.vcxproj" />
15-
<ProjectFile Include="vs14.android\header_test140.android.vcxproj" />
15+
<ProjectFile Include="vs14.android\header_test140.android.vcxproj" Condition="'$(Platform)'!='x64'" />
1616
</ItemGroup>
1717

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

Release/tests/functional/pplx/pplx_test/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
1616
<ProjectFile Include="VS14\pplx140_test.vcxproj" />
17-
<ProjectFile Include="vs14.android\pplx140_test.android.vcxproj" />
17+
<ProjectFile Include="vs14.android\pplx140_test.android.vcxproj" Condition="'$(Platform)'!='x64'" />
1818
</ItemGroup>
1919

2020
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110'">

Release/tests/functional/streams/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
2424
<ProjectFile Include="VS14\streams140_test.vcxproj" />
25-
<ProjectFile Include="vs14.android\streams140_test.android.vcxproj" />
25+
<ProjectFile Include="vs14.android\streams140_test.android.vcxproj" Condition="'$(Platform)'!='x64'" />
2626
</ItemGroup>
2727

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

Release/tests/functional/uri/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
2424
<ProjectFile Include="VS14\Uri140_test.vcxproj" />
25-
<ProjectFile Include="vs14.android\Uri140_test.android.vcxproj" />
25+
<ProjectFile Include="vs14.android\Uri140_test.android.vcxproj" Condition="'$(Platform)'!='x64'" />
2626
</ItemGroup>
2727

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

Release/tests/functional/utils/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
2020
<ProjectFile Include="VS14\Utils140_test.vcxproj" />
21-
<ProjectFile Include="vs14.android\Utils140_test.android.vcxproj" />
21+
<ProjectFile Include="vs14.android\Utils140_test.android.vcxproj" Condition="'$(Platform)'!='x64'" />
2222
</ItemGroup>
2323

2424
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">

0 commit comments

Comments
 (0)