blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: restore compatibility with older Catch2 releases

This commit is contained in:
Aleksei Bavshin 2024-02-19 16:49:27 -08:00
parent d59d6e8765
commit 5d6acfd1d4
No known key found for this signature in database
GPG Key ID: 4F071603387A382A
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -558,7 +558,6 @@ endif
catch2 = dependency( catch2 = dependency(
'catch2', 'catch2',
version: '>=3.5.1',
default_options: [ 'tests=false' ], default_options: [ 'tests=false' ],
fallback: ['catch2', 'catch2_dep'], fallback: ['catch2', 'catch2_dep'],
required: get_option('tests'), required: get_option('tests'),

1
test/css_reload_helper.cpp
View File

@ -4,7 +4,6 @@
#if __has_include(<catch2/catch_test_macros.hpp>) #if __has_include(<catch2/catch_test_macros.hpp>)
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <catch2/matchers/catch_matchers_all.hpp>
#else #else
#include <catch2/catch.hpp> #include <catch2/catch.hpp>
#endif #endif

2
test/date.cpp
View File

@ -7,7 +7,7 @@
#if __has_include(<catch2/catch_test_macros.hpp>) #if __has_include(<catch2/catch_test_macros.hpp>)
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <catch2/matchers/catch_matchers_all.hpp> #include <catch2/matchers/catch_matchers_string.hpp>
#else #else
#include <catch2/catch.hpp> #include <catch2/catch.hpp>
#endif #endif

5
test/main.cpp
View File

@ -3,8 +3,9 @@
#include <spdlog/sinks/stdout_sinks.h> #include <spdlog/sinks/stdout_sinks.h>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#if __has_include(<catch2/catch_all.hpp>) #if __has_include(<catch2/catch_session.hpp>)
#include <catch2/catch_all.hpp> #include <catch2/catch_session.hpp>
#include <catch2/catch_version_macros.hpp>
#include <catch2/reporters/catch_reporter_tap.hpp> #include <catch2/reporters/catch_reporter_tap.hpp>
#else #else
#include <catch2/catch.hpp> #include <catch2/catch.hpp>