From 3b37818e5ece953bf9d4d2f269de19355f160565 Mon Sep 17 00:00:00 2001
From: zhaowenlan1779 <zhupengfei321@sina.cn>
Date: Sat, 25 Aug 2018 01:45:57 +0800
Subject: [PATCH] Port "externals: Update catch to 2.3.0" from yuzu (#4060)

* externals: Update catch to 2.3.0

Updates the library from 2.2.3 to 2.3.0

* fix catch2/catch.hpp includes
---
 externals/catch                                         | 2 +-
 src/tests/common/param_package.cpp                      | 2 +-
 src/tests/core/arm/dyncom/arm_dyncom_vfp_tests.cpp      | 2 +-
 src/tests/core/core_timing.cpp                          | 2 +-
 src/tests/core/file_sys/path_parser.cpp                 | 2 +-
 src/tests/core/hle/kernel/hle_ipc.cpp                   | 2 +-
 src/tests/core/memory/memory.cpp                        | 2 +-
 src/tests/core/memory/vm_manager.cpp                    | 2 +-
 src/tests/glad.cpp                                      | 2 +-
 src/tests/tests.cpp                                     | 2 +-
 src/tests/video_core/shader/shader_jit_x64_compiler.cpp | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/externals/catch b/externals/catch
index d2d8455b57..15cf3caace 160000
--- a/externals/catch
+++ b/externals/catch
@@ -1 +1 @@
-Subproject commit d2d8455b571b6c66c4b7003500a77f9a93ecdc28
+Subproject commit 15cf3caaceb21172ea42a24e595a2eb58c3ec960
diff --git a/src/tests/common/param_package.cpp b/src/tests/common/param_package.cpp
index 57fb95df22..26ac40a9b9 100644
--- a/src/tests/common/param_package.cpp
+++ b/src/tests/common/param_package.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <cmath>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include "common/param_package.h"
 
 namespace Common {
diff --git a/src/tests/core/arm/dyncom/arm_dyncom_vfp_tests.cpp b/src/tests/core/arm/dyncom/arm_dyncom_vfp_tests.cpp
index 04ac83d2b7..848ed2c3cc 100644
--- a/src/tests/core/arm/dyncom/arm_dyncom_vfp_tests.cpp
+++ b/src/tests/core/arm/dyncom/arm_dyncom_vfp_tests.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "core/arm/dyncom/arm_dyncom.h"
 #include "core/core_timing.h"
diff --git a/src/tests/core/core_timing.cpp b/src/tests/core/core_timing.cpp
index fcaa30990c..2242c14cf2 100644
--- a/src/tests/core/core_timing.cpp
+++ b/src/tests/core/core_timing.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <array>
 #include <bitset>
diff --git a/src/tests/core/file_sys/path_parser.cpp b/src/tests/core/file_sys/path_parser.cpp
index 2b543e438a..da9380da6d 100644
--- a/src/tests/core/file_sys/path_parser.cpp
+++ b/src/tests/core/file_sys/path_parser.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include "common/file_util.h"
 #include "core/file_sys/path_parser.h"
 
diff --git a/src/tests/core/hle/kernel/hle_ipc.cpp b/src/tests/core/hle/kernel/hle_ipc.cpp
index b9a79f174c..d0bf44a587 100644
--- a/src/tests/core/hle/kernel/hle_ipc.cpp
+++ b/src/tests/core/hle/kernel/hle_ipc.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include "core/hle/ipc.h"
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/client_session.h"
diff --git a/src/tests/core/memory/memory.cpp b/src/tests/core/memory/memory.cpp
index afea9efeff..ea45e50a16 100644
--- a/src/tests/core/memory/memory.cpp
+++ b/src/tests/core/memory/memory.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/process.h"
 #include "core/memory.h"
diff --git a/src/tests/core/memory/vm_manager.cpp b/src/tests/core/memory/vm_manager.cpp
index f3974291da..00d03dbc3e 100644
--- a/src/tests/core/memory/vm_manager.cpp
+++ b/src/tests/core/memory/vm_manager.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <vector>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include "core/hle/kernel/errors.h"
 #include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/vm_manager.h"
diff --git a/src/tests/glad.cpp b/src/tests/glad.cpp
index b0b0164400..1797c0e3d1 100644
--- a/src/tests/glad.cpp
+++ b/src/tests/glad.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <glad/glad.h>
 
 // This is not an actual test, but a work-around for issue #2183.
diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
index 73978676f1..275b430d94 100644
--- a/src/tests/tests.cpp
+++ b/src/tests/tests.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #define CATCH_CONFIG_MAIN
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 // Catch provides the main function since we've given it the
 // CATCH_CONFIG_MAIN preprocessor directive.
diff --git a/src/tests/video_core/shader/shader_jit_x64_compiler.cpp b/src/tests/video_core/shader/shader_jit_x64_compiler.cpp
index 7008670f51..d4576acac5 100644
--- a/src/tests/video_core/shader/shader_jit_x64_compiler.cpp
+++ b/src/tests/video_core/shader/shader_jit_x64_compiler.cpp
@@ -5,7 +5,7 @@
 #include <algorithm>
 #include <cmath>
 #include <memory>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <nihstro/inline_assembly.h>
 #include "video_core/shader/shader_jit_x64_compiler.h"