From 4de7ae4bce59602f1def7d3c32b47645aedbe5b9 Mon Sep 17 00:00:00 2001
From: Andy Mishechkin <57713077+andy-mishechkin@users.noreply.github.com>
Date: Thu, 30 Jul 2020 08:20:19 +0400
Subject: [PATCH] Msys2 clang-tools-extra have been added to windows deployment
 (#1311)

* clang-tidy.exe has been added

* tools have been split to tools64\32
---
 images/win/scripts/Installers/Install-Msys2.ps1 | 7 ++++---
 images/win/scripts/Tests/MSYS2.Tests.ps1        | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1
index 3adf24e39..f0da38503 100644
--- a/images/win/scripts/Installers/Install-Msys2.ps1
+++ b/images/win/scripts/Installers/Install-Msys2.ps1
@@ -60,17 +60,18 @@ Write-Host "`n$dash Remove p7zip/7z package due to conflicts"
 pacman.exe -R --noconfirm --noprogressbar p7zip
 
 # mingw package list
-$tools = "___clang ___cmake ___llvm  ___toolchain ___ragel"
+$tools64 = "___clang ___clang-tools-extra ___cmake ___llvm  ___toolchain ___ragel"
+$tools32 = "___clang ___cmake ___llvm  ___toolchain ___ragel"
 
 # install mingw64 packages
 Write-Host "`n$dash Install mingw64 packages"
 $pre = "mingw-w64-x86_64-"
-pacman.exe -S --noconfirm --needed --noprogressbar $tools.replace('___', $pre).split(' ')
+pacman.exe -S --noconfirm --needed --noprogressbar $tools64.replace('___', $pre).split(' ')
 
 # install mingw32 packages
 Write-Host "`n$dash Install mingw32 packages"
 $pre = "mingw-w64-i686-"
-pacman.exe -S --noconfirm --needed --noprogressbar $tools.replace('___', $pre).split(' ')
+pacman.exe -S --noconfirm --needed --noprogressbar $tools32.replace('___', $pre).split(' ')
 
 # clean all packages to decrease image size
 Write-Host "`n$dash Clean packages"
diff --git a/images/win/scripts/Tests/MSYS2.Tests.ps1 b/images/win/scripts/Tests/MSYS2.Tests.ps1
index cb8c20001..e0c6486d0 100644
--- a/images/win/scripts/Tests/MSYS2.Tests.ps1
+++ b/images/win/scripts/Tests/MSYS2.Tests.ps1
@@ -16,6 +16,7 @@ Describe "MSYS2" {
         @{ ToolName = "gcc.exe" }
         @{ ToolName = "cmake.exe" }
         @{ ToolName = "g++.exe" }
+        @{ ToolName = "clang-tidy.exe" }
     ) {
         Join-Path $msys2mingwDir $ToolName | Should -Exist
     }