haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-08-22 13:02:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

✅ added progress output for Unicode tests

Browse source 
Travis aborts tests if they do not produce output for 10 minutes. This commit shall fix this.
This commit is contained in:
Niels Lohmann 2017-06-21 18:50:11 +02:00
parent 6f3bebff5c
commit 4b5433578a
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/json.hpp
View file

@ -12914,7 +12914,7 @@ scan_number_done:
default: default:
{ {
// we expected a value // the last token was unexpected; we expected a value
expect(lexer::token_type::literal_or_value); expect(lexer::token_type::literal_or_value);
} }
} }

7
test/src/unit-unicode.cpp
View file

@ -34,11 +34,18 @@ using nlohmann::json;
#include <fstream> #include <fstream>
size_t calls = 0;
void check_utf8string(bool success_expected, int byte1, int byte2, int byte3, int byte4); void check_utf8string(bool success_expected, int byte1, int byte2, int byte3, int byte4);
// create and check a JSON string with up to four UTF-8 bytes // create and check a JSON string with up to four UTF-8 bytes
void check_utf8string(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1) void check_utf8string(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
{ {
if (++calls % 100000 == 0)
{
std::cout << calls << " UTF-8 strings checked" << std::endl;
}
std::string json_string = "\""; std::string json_string = "\"";
CAPTURE(byte1); CAPTURE(byte1);