From 0dd1c396a1039160f696c5b5730510f2c30ad85d Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Wed, 6 Jul 2022 01:00:28 +0200
Subject: [PATCH] Update LLVM to version 14 (#5863)

---
 images/win/scripts/Tests/LLVM.Tests.ps1 | 7 +++++--
 images/win/toolsets/toolset-2019.json   | 2 +-
 images/win/toolsets/toolset-2022.json   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/images/win/scripts/Tests/LLVM.Tests.ps1 b/images/win/scripts/Tests/LLVM.Tests.ps1
index a20fd9609..c7a5df40e 100644
--- a/images/win/scripts/Tests/LLVM.Tests.ps1
+++ b/images/win/scripts/Tests/LLVM.Tests.ps1
@@ -1,7 +1,10 @@
 Describe "Clang/LLVM" {
-    It "Clang/LLVM installed and version is correct" {
+    BeforeAll {
         $toolsetVersion = (Get-ToolsetContent).llvm.version
+    }
+
+    It "Clang/LLVM <toolsetVersion> installed and version is correct" {
         $clangVersion = clang --version
         $clangVersion[0] | Should -BeLike "*${toolsetVersion}*"
     }
-}
\ No newline at end of file
+}
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 39265c49f..3ae51ce8a 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -478,7 +478,7 @@
         "version": "8.1"
     },
     "llvm": {
-        "version": "13"
+        "version": "14"
     },
     "postgresql": {
         "version": "14"
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index add06167e..26065e646 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -359,7 +359,7 @@
         "version": "3.08"
     },
     "llvm": {
-        "version": "13"
+        "version": "14"
     },
     "php": {
         "version": "8.1"