BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-14 16:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix few MSVC warnings

Browse Source
This commit is contained in:
Matvey Cherevko
2019-10-01 06:58:17 +07:00
parent 7543125434
commit 6f5fbad449
8 changed files with 38 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
untests/CMakeLists.txt
View File

@@ -19,6 +19,14 @@ function(add_e2d_tests NAME)
target_link_libraries(${TESTS_NAME} enduro2d)
set_target_properties(${TESTS_NAME} PROPERTIES FOLDER untests)
target_compile_options(${TESTS_NAME}
PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:
/W3 /MP /bigobj>
PRIVATE
$<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:
-Wall -Wextra -Wpedantic>)
#
# resources
#
@@ -36,28 +44,8 @@ function(add_e2d_tests NAME)
add_test(${TESTS_NAME} ${TESTS_NAME})
endfunction(add_e2d_tests)
option(E2D_BUILD_BASE_UNTESTS "Build base untests" ON)
option(E2D_BUILD_CORE_UNTESTS "Build core untests" ON)
option(E2D_BUILD_HIGH_UNTESTS "Build high untests" ON)
option(E2D_BUILD_MATH_UNTESTS "Build math untests" ON)
option(E2D_BUILD_UTILS_UNTESTS "Build utils untests" ON)
if(E2D_BUILD_BASE_UNTESTS)
add_e2d_tests(base)
endif()
if(E2D_BUILD_CORE_UNTESTS)
add_e2d_tests(core)
endif()
if(E2D_BUILD_HIGH_UNTESTS)
add_e2d_tests(high)
endif()
if(E2D_BUILD_MATH_UNTESTS)
add_e2d_tests(math)
endif()
if(E2D_BUILD_UTILS_UNTESTS)
add_e2d_tests(utils)
endif()
add_e2d_tests(base)
add_e2d_tests(core)
add_e2d_tests(high)
add_e2d_tests(math)
add_e2d_tests(utils)

4
untests/sources/untests_utils/strings.cpp
View File

@@ -212,9 +212,9 @@ TEST_CASE("strings") {
REQUIRE(wildcard_match(
// 你好你好你好你好世界世界世界世界世界世界世界世界彡ಠ
mark_string("\u4F60\u597D\u4F60\u597D\u4F60\u597D\u4F60\u597D\u4E16\u754C\u4E16\u754C\u4E16\u754C\u4E16\u754C\u4E16\u754C\u4E16\u754C\u4E16\u754C\u4E16\u754C\u5F61\u0CA0"),
mark_string(u8"\u4F60\u597D\u4F60\u597D\u4F60\u597D\u4F60\u597D\u4E16\u754C\u4E16\u754C\u4E16\u754C\u4E16\u754C\u4E16\u754C\u4E16\u754C\u4E16\u754C\u4E16\u754C\u5F61\u0CA0"),
// 你好你好你好你好*世界世界彡*ಠ
mark_pattern("\u4F60\u597D\u4F60\u597D\u4F60\u597D\u4F60\u597D*\u4E16\u754C\u4E16\u754C\u5F61*\u0CA0")) == true);
mark_pattern(u8"\u4F60\u597D\u4F60\u597D\u4F60\u597D\u4F60\u597D*\u4E16\u754C\u4E16\u754C\u5F61*\u0CA0")) == true);
REQUIRE(wildcard_match("", "") == true);
REQUIRE(wildcard_match("a", "") == false);