summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-08 03:00:57 -0400
committerGravatar GitHub2018-08-08 03:00:57 -0400
commitf156a45c0155c7fe227dfb74a92d797e3d3f2032 (patch)
tree6005bc1d441409a49dff6ef7a562e47482eae6db /src
parentMerge pull request #965 from lioncash/unused-files (diff)
parentexternals: Update catch to 2.3.0 (diff)
downloadyuzu-f156a45c0155c7fe227dfb74a92d797e3d3f2032.tar.gz
yuzu-f156a45c0155c7fe227dfb74a92d797e3d3f2032.tar.xz
yuzu-f156a45c0155c7fe227dfb74a92d797e3d3f2032.zip
Merge pull request #972 from lioncash/catch
externals: Update catch to 2.3.0
Diffstat (limited to 'src')
-rw-r--r--src/tests/common/param_package.cpp2
-rw-r--r--src/tests/core/core_timing.cpp2
-rw-r--r--src/tests/glad.cpp2
-rw-r--r--src/tests/tests.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/common/param_package.cpp b/src/tests/common/param_package.cpp
index 19d372236..4c0f9654f 100644
--- a/src/tests/common/param_package.cpp
+++ b/src/tests/common/param_package.cpp
@@ -2,7 +2,7 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <catch.hpp> 5#include <catch2/catch.hpp>
6#include <math.h> 6#include <math.h>
7#include "common/param_package.h" 7#include "common/param_package.h"
8 8
diff --git a/src/tests/core/core_timing.cpp b/src/tests/core/core_timing.cpp
index fcaa30990..2242c14cf 100644
--- a/src/tests/core/core_timing.cpp
+++ b/src/tests/core/core_timing.cpp
@@ -2,7 +2,7 @@
2// Licensed under GPLv2+ 2// Licensed under GPLv2+
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <catch.hpp> 5#include <catch2/catch.hpp>
6 6
7#include <array> 7#include <array>
8#include <bitset> 8#include <bitset>
diff --git a/src/tests/glad.cpp b/src/tests/glad.cpp
index b0b016440..1797c0e3d 100644
--- a/src/tests/glad.cpp
+++ b/src/tests/glad.cpp
@@ -2,7 +2,7 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <catch.hpp> 5#include <catch2/catch.hpp>
6#include <glad/glad.h> 6#include <glad/glad.h>
7 7
8// This is not an actual test, but a work-around for issue #2183. 8// 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 73978676f..275b430d9 100644
--- a/src/tests/tests.cpp
+++ b/src/tests/tests.cpp
@@ -3,7 +3,7 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#define CATCH_CONFIG_MAIN 5#define CATCH_CONFIG_MAIN
6#include <catch.hpp> 6#include <catch2/catch.hpp>
7 7
8// Catch provides the main function since we've given it the 8// Catch provides the main function since we've given it the
9// CATCH_CONFIG_MAIN preprocessor directive. 9// CATCH_CONFIG_MAIN preprocessor directive.