diff --git a/cmake/ci.cmake b/cmake/ci.cmake index 8261cb9d8..8794ed078 100644 --- a/cmake/ci.cmake +++ b/cmake/ci.cmake @@ -494,7 +494,7 @@ add_custom_target(ci_test_clang_sanitizer -DJSON_BuildTests=ON -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang_sanitizer COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_clang_sanitizer - COMMAND cd ${PROJECT_BINARY_DIR}/build_clang_sanitizer && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure --timeout 1500 + COMMAND cd ${PROJECT_BINARY_DIR}/build_clang_sanitizer && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure COMMENT "Compile and test with sanitizers" ) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f9a82112b..cbbdcace3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -81,10 +81,6 @@ foreach(file ${files}) endif() set_tests_properties("${testcase}" PROPERTIES LABELS "all" FIXTURES_REQUIRED TEST_DATA) - if (${testcase} STREQUAL "test-unicode") - set_tests_properties("${testcase}" PROPERTIES RUN_SERIAL ON) - endif() - if(JSON_Valgrind) add_test(NAME "${testcase}_valgrind" COMMAND ${memcheck_command} ${CMAKE_CURRENT_BINARY_DIR}/${testcase} ${DOCTEST_TEST_FILTER} diff --git a/test/src/unit-unicode.cpp b/test/src/unit-unicode.cpp index b65e530a8..bdc79cf2e 100644 --- a/test/src/unit-unicode.cpp +++ b/test/src/unit-unicode.cpp @@ -172,26 +172,27 @@ void check_utf8string(bool success_expected, int byte1, int byte2 = -1, int byte TEST_CASE("Unicode" * doctest::skip()) { - /* SECTION("RFC 3629") { - // RFC 3629 describes in Sect. 4 the syntax of UTF-8 byte sequences as - // follows: - // - // A UTF-8 string is a sequence of octets representing a sequence of UCS - // characters. An octet sequence is valid UTF-8 only if it matches the - // following syntax, which is derived from the rules for encoding UTF-8 - // and is expressed in the ABNF of [RFC2234]. - // - // UTF8-octets = *( UTF8-char ) - // UTF8-char = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4 - // UTF8-1 = %x00-7F - // UTF8-2 = %xC2-DF UTF8-tail - // UTF8-3 = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) / - // %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail ) - // UTF8-4 = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) / - // %xF4 %x80-8F 2( UTF8-tail ) - // UTF8-tail = %x80-BF + /* + RFC 3629 describes in Sect. 4 the syntax of UTF-8 byte sequences as + follows: + + A UTF-8 string is a sequence of octets representing a sequence of UCS + characters. An octet sequence is valid UTF-8 only if it matches the + following syntax, which is derived from the rules for encoding UTF-8 + and is expressed in the ABNF of [RFC2234]. + + UTF8-octets = *( UTF8-char ) + UTF8-char = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4 + UTF8-1 = %x00-7F + UTF8-2 = %xC2-DF UTF8-tail + UTF8-3 = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) / + %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail ) + UTF8-4 = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) / + %xF4 %x80-8F 2( UTF8-tail ) + UTF8-tail = %x80-BF + */ SECTION("ill-formed first byte") { @@ -995,7 +996,6 @@ TEST_CASE("Unicode" * doctest::skip()) } } } - */ SECTION("\\uxxxx sequences") {