From 62dd695308e0da3613c56f6f9bea05196d5852d8 Mon Sep 17 00:00:00 2001
From: Krzysztof Wicher <mordotymoja@gmail.com>
Date: Tue, 15 Oct 2019 11:30:39 -0700
Subject: [PATCH] Run unit tests as part of the build (and CI) (#789)

* Run unit tests as part of CI and official runs

* update yml

* Target => Targets

* add RuntimeIdentifiers to Mcp23xxx tests and do not run hardware independent tests on Windows (there is none)

* use linux rid instead of ubuntu.18.04-x64

* Try removin RuntimeIdentifiers from Mcp23xxx

* do not pass RuntimeIdentifier for hardware independent tests

* workaround arcade issue #4107

* remove failing test

* differentiate binlog output

* Run tests as part of the build

* Remove hack causing output to get printed
---
 build.proj                          | 13 +++++++++++--
 src/devices/Directory.Build.targets |  1 -
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/build.proj b/build.proj
index 50943bef92..de2825d2fe 100644
--- a/build.proj
+++ b/build.proj
@@ -20,11 +20,15 @@
 
   <Import Project="Directory.Build.targets" />
 
+  <ItemGroup>
+    <UnitTestProjects Include="$(MSBuildThisFileDirectory)src\devices\**\*.Tests.csproj" />
+  </ItemGroup>
+
   <Target Name="BuildProduct">
     <ItemGroup>
       <_ExcludeBuildProductProjects Include="$(MSBuildThisFileDirectory)src\Iot.Device.Bindings\Iot.Device.Bindings.csproj" />
       <_ExcludeBuildProductProjects Include="$(MSBuildThisFileDirectory)src\Native\build-native.proj" />
-      <_BuildProductProjects Include="$(MSBuildThisFileDirectory)src\**\*.csproj" Exclude="@(_ExcludeBuildProductProjects)" />
+      <_BuildProductProjects Include="$(MSBuildThisFileDirectory)src\**\*.csproj" Exclude="@(_ExcludeBuildProductProjects);@(UnitTestProjects)" />
     </ItemGroup>
 
     <MSBuild Projects="@(_BuildProductProjects)" />
@@ -56,7 +60,12 @@
     <MSBuild Projects="@(_ProjectsToRestore)" Targets="Restore" />
   </Target>
 
-  <Target Name="Test" />
+  <Target Name="Test">
+    <MSBuild Projects="@(UnitTestProjects)" Targets="VSTest"
+        ContinueOnError="ErrorAndContinue" />
+    <Error Condition="$(MSBuildLastTaskResult) != 'true'"
+        Text="Unit tests failed. Please check the detailed log to find out which ones failed." />
+  </Target>
 
   <Target Name="Pack">
     <ItemGroup>
diff --git a/src/devices/Directory.Build.targets b/src/devices/Directory.Build.targets
index 7ea3437650..341027f3c7 100644
--- a/src/devices/Directory.Build.targets
+++ b/src/devices/Directory.Build.targets
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-	<Target Name="Test" />
 </Project>