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

---
 images/macos/tests/LLVM.Tests.ps1        | 7 ++++---
 images/macos/toolsets/toolset-10.15.json | 2 +-
 images/macos/toolsets/toolset-11.json    | 2 +-
 images/macos/toolsets/toolset-12.json    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/images/macos/tests/LLVM.Tests.ps1 b/images/macos/tests/LLVM.Tests.ps1
index 2e371ef7..af5b6353 100644
--- a/images/macos/tests/LLVM.Tests.ps1
+++ b/images/macos/tests/LLVM.Tests.ps1
@@ -1,8 +1,9 @@
-$os = Get-OSVersion
-
 Describe "Clang/LLVM" {
-    It "Clang/LLVM is installed and version is correct" {
+    BeforeAll {
         $toolsetVersion = Get-ToolsetValue 'llvm.version'
+    }
+
+    It "Clang/LLVM <toolsetVersion> is installed and version is correct" {
         $clangVersion = & "$(brew --prefix llvm@$toolsetVersion)/bin/clang" --version
         $clangVersion[0] | Should -BeLike "*${toolsetVersion}*"
     }
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index 28e289c4..05874c59 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -343,7 +343,7 @@
         ]
     },
     "llvm": {
-        "version": "13"
+        "version": "14"
     },
     "php": {
         "version": "8.1"
diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
index 87a87a50..c314ffc8 100644
--- a/images/macos/toolsets/toolset-11.json
+++ b/images/macos/toolsets/toolset-11.json
@@ -333,7 +333,7 @@
         ]
     },
     "llvm": {
-        "version": "13"
+        "version": "14"
     },
     "php": {
         "version": "8.1"
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index 8ef37319..c4eae429 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -262,7 +262,7 @@
         ]
     },
     "llvm": {
-        "version": "13"
+        "version": "14"
     },
     "php": {
         "version": "8.1"