External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⏪ revert experiments

Browse Source
This commit is contained in:
Niels Lohmann 2021-07-21 19:42:51 +02:00
parent dea6ae0b7d
commit 8147a95e5c
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/ci.cmake
View File

@ -494,7 +494,7 @@ add_custom_target(ci_test_clang_sanitizer
-DJSON_BuildTests=ON -DJSON_BuildTests=ON
-S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang_sanitizer -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang_sanitizer
COMMAND ${CMAKE_COMMAND} --build ${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" COMMENT "Compile and test with sanitizers"
) )

4
test/CMakeLists.txt
View File

@ -81,10 +81,6 @@ foreach(file ${files})
endif() endif()
set_tests_properties("${testcase}" PROPERTIES LABELS "all" FIXTURES_REQUIRED TEST_DATA) 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) if(JSON_Valgrind)
add_test(NAME "${testcase}_valgrind" add_test(NAME "${testcase}_valgrind"
COMMAND ${memcheck_command} ${CMAKE_CURRENT_BINARY_DIR}/${testcase} ${DOCTEST_TEST_FILTER} COMMAND ${memcheck_command} ${CMAKE_CURRENT_BINARY_DIR}/${testcase} ${DOCTEST_TEST_FILTER}

38
test/src/unit-unicode.cpp
View File

@ -172,26 +172,27 @@ void check_utf8string(bool success_expected, int byte1, int byte2 = -1, int byte
TEST_CASE("Unicode" * doctest::skip()) TEST_CASE("Unicode" * doctest::skip())
{ {
/*
SECTION("RFC 3629") SECTION("RFC 3629")
{ {
// RFC 3629 describes in Sect. 4 the syntax of UTF-8 byte sequences as /*
// follows: 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 A UTF-8 string is a sequence of octets representing a sequence of UCS
// following syntax, which is derived from the rules for encoding UTF-8 characters. An octet sequence is valid UTF-8 only if it matches the
// and is expressed in the ABNF of [RFC2234]. 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-octets = *( UTF8-char )
// UTF8-1 = %x00-7F UTF8-char = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
// UTF8-2 = %xC2-DF UTF8-tail UTF8-1 = %x00-7F
// UTF8-3 = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) / UTF8-2 = %xC2-DF UTF8-tail
// %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail ) UTF8-3 = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
// UTF8-4 = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) / %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
// %xF4 %x80-8F 2( UTF8-tail ) UTF8-4 = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
// UTF8-tail = %x80-BF %xF4 %x80-8F 2( UTF8-tail )
UTF8-tail = %x80-BF
*/
SECTION("ill-formed first byte") SECTION("ill-formed first byte")
{ {
@ -995,7 +996,6 @@ TEST_CASE("Unicode" * doctest::skip())
} }
} }
} }
*/
SECTION("\\uxxxx sequences") SECTION("\\uxxxx sequences")
{ {