openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Update Catch to v2.13.10

Browse Source
This commit is contained in:
Celtic Minstrel
2024-08-10 14:03:30 -04:00
parent 30e583b1d4
commit 4d4ab09395
8 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/Catch2 vendored

Submodule deps/Catch2 updated: 3b18d9e962...182c910b4b

8
proj/vs2017/Tests/Tests.vcxproj
View File

@@ -94,7 +94,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
@@ -114,7 +114,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
<PrecompiledHeaderFile /> <PrecompiledHeaderFile />
<PrecompiledHeaderOutputFile /> <PrecompiledHeaderOutputFile />
@@ -136,7 +136,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
@@ -161,7 +161,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
<PrecompiledHeaderFile /> <PrecompiledHeaderFile />

10
proj/xc12/BoE.xcodeproj/project.pbxproj
View File

@@ -2314,10 +2314,11 @@
/opt/local/include, /opt/local/include,
/usr/local/Cellar/include, /usr/local/Cellar/include,
"$(PROJECT_DIR)/../../deps/cppcodec", "$(PROJECT_DIR)/../../deps/cppcodec",
"$(PROJECT_DIR)/../../deps/Catch2/single_include", "$(PROJECT_DIR)/../../deps/Catch2/single_include/catch2",
"$(PROJECT_DIR)/../../src/fileio/gzstream", "$(PROJECT_DIR)/../../src/fileio/gzstream",
"$(PROJECT_DIR)/../../src/fileio/xml-parser", "$(PROJECT_DIR)/../../src/fileio/xml-parser",
"$(PROJECT_DIR)/../../src/tools" "$(PROJECT_DIR)/../../src/tools",
"$(PROJECT_DIR)/../../deps/Catch2/include/external",
); );
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
@@ -2426,10 +2427,11 @@
/opt/local/include, /opt/local/include,
/usr/local/Cellar/include, /usr/local/Cellar/include,
"$(PROJECT_DIR)/../../deps/cppcodec", "$(PROJECT_DIR)/../../deps/cppcodec",
"$(PROJECT_DIR)/../../deps/Catch2/single_include", "$(PROJECT_DIR)/../../deps/Catch2/single_include/catch2",
"$(PROJECT_DIR)/../../src/fileio/gzstream", "$(PROJECT_DIR)/../../src/fileio/gzstream",
"$(PROJECT_DIR)/../../src/fileio/xml-parser", "$(PROJECT_DIR)/../../src/fileio/xml-parser",
"$(PROJECT_DIR)/../../src/tools" "$(PROJECT_DIR)/../../src/tools",
"$(PROJECT_DIR)/../../deps/Catch2/include/external",
); );
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (

4
proj/xc4/BoE.xcodeproj/project.pbxproj
View File

@@ -2510,7 +2510,7 @@
"DEBUG=1", "DEBUG=1",
"$(inherited)", "$(inherited)",
); );
HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/../../deps/Catch2/single_include\""; HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/../../deps/Catch2/single_include/catch2\"";
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-lboost_system", "-lboost_system",
@@ -2524,7 +2524,7 @@
91CC17361B421C0A003D9A69 /* Release */ = { 91CC17361B421C0A003D9A69 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/../../deps/Catch2/single_include\""; HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/../../deps/Catch2/single_include/catch2\"";
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };

2
src/fileio/tagfile.hpp
View File

@@ -206,7 +206,7 @@ public:
void readFrom(std::istream& file); void readFrom(std::istream& file);
void writeTo(std::ostream& file); void writeTo(std::ostream& file);
template<typename T> template<typename T>
bool operator==(const T& other) { bool operator==(const T& other) const {
T self; T self;
if(extract(0, self) == 0) return false; if(extract(0, self) == 0) return false;
return self == other; return self == other;

2
test/SConscript
View File

@@ -5,7 +5,7 @@ Import("env platform party_classes common_sources")
arch_short = '64' if (env['bits'] == '64') else '86' arch_short = '64' if (env['bits'] == '64') else '86'
# Add path to scons # Add path to scons
env.Append(CPPPATH=['./deps/Catch2/single_include']) env.Append(CPPPATH=['./deps/Catch2/single_include/catch2'])
test_sources = Glob("""*.cpp""") + Split(""" test_sources = Glob("""*.cpp""") + Split("""
#build/obj/scenedit/scen.fileio.cpp #build/obj/scenedit/scen.fileio.cpp

1
test/map_read.cpp
View File

@@ -7,6 +7,7 @@
// //
#include <fstream> #include <fstream>
#include <set>
#include "catch.hpp" #include "catch.hpp"
#include "fileio/map_parse.hpp" #include "fileio/map_parse.hpp"
#include "scenario/scenario.hpp" #include "scenario/scenario.hpp"

1
test/map_write.cpp
View File

@@ -7,6 +7,7 @@
// //
#include <fstream> #include <fstream>
#include <set>
#include "catch.hpp" #include "catch.hpp"
#include "fileio/map_parse.hpp" #include "fileio/map_parse.hpp"
#include "scenario/scenario.hpp" #include "scenario/scenario.hpp"