Kaynağa Gözat

Merge pull request #972 from lioncash/catch

externals: Update catch to 2.3.0
bunnei 8 yıl önce
ebeveyn
işleme
f156a45c01

+ 1 - 1
externals/catch

@@ -1 +1 @@
-Subproject commit d2a130f2433aeaca070e3e4d6298a80049d21cfc
+Subproject commit 15cf3caaceb21172ea42a24e595a2eb58c3ec960

+ 1 - 1
src/tests/common/param_package.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 // Refer to the license.txt file included.
 
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <math.h>
 #include <math.h>
 #include "common/param_package.h"
 #include "common/param_package.h"
 
 

+ 1 - 1
src/tests/core/core_timing.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 // Refer to the license.txt file included.
 
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 
 #include <array>
 #include <array>
 #include <bitset>
 #include <bitset>

+ 1 - 1
src/tests/glad.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 // Refer to the license.txt file included.
 
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <glad/glad.h>
 #include <glad/glad.h>
 
 
 // This is not an actual test, but a work-around for issue #2183.
 // This is not an actual test, but a work-around for issue #2183.

+ 1 - 1
src/tests/tests.cpp

@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 // Refer to the license.txt file included.
 
 
 #define CATCH_CONFIG_MAIN
 #define CATCH_CONFIG_MAIN
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 
 // Catch provides the main function since we've given it the
 // Catch provides the main function since we've given it the
 // CATCH_CONFIG_MAIN preprocessor directive.
 // CATCH_CONFIG_MAIN preprocessor directive.