diff options
| author | Feng Xiao <xiaofeng@google.com> | 2016-09-23 16:50:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 16:50:42 -0700 |
| commit | c454b4433597bbce706138cb83a1aaa722ed544d (patch) | |
| tree | 7a63233cb07785330054307a40fc6f0d9bad0579 | |
| parent | 18f336b98aa21e7f735cff9186c6c1fc347ad7a6 (diff) | |
| parent | 73c8723266875edccb2e006774751ebec2864626 (diff) | |
| download | protobuf-c454b4433597bbce706138cb83a1aaa722ed544d.tar.gz protobuf-c454b4433597bbce706138cb83a1aaa722ed544d.tar.bz2 protobuf-c454b4433597bbce706138cb83a1aaa722ed544d.zip | |
Merge pull request #2171 from xfxyjwf/fix_json
Reduce test length to avoid stack overflow on VS.
| -rw-r--r-- | appveyor.yml | 6 | ||||
| -rw-r--r-- | src/google/protobuf/util/internal/json_stream_parser_test.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/appveyor.yml b/appveyor.yml index 20fc8ade..08d087b6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,16 +20,16 @@ environment: test: off install: - - ps: Start-FileDownload https://github.com/google/googlemock/archive/release-1.7.0.zip + - curl -L -o release-1.7.0.zip https://github.com/google/googlemock/archive/release-1.7.0.zip - 7z x release-1.7.0.zip - del /Q release-1.7.0.zip - rename googlemock-release-1.7.0 gmock - - ps: Start-FileDownload https://github.com/google/googletest/archive/release-1.7.0.zip + - curl -L -o release-1.7.0.zip "https://github.com/google/googletest/archive/release-1.7.0.zip" - 7z x release-1.7.0.zip - del /Q release-1.7.0.zip - rename googletest-release-1.7.0 gtest - move gtest gmock - - ps: Start-FileDownload https://go.microsoft.com/fwlink/?LinkID=809122 -FileName dotnetsdk.exe + - curl -L -o dotnetsdk.exe "https://go.microsoft.com/fwlink/?LinkID=809122" - dotnetsdk.exe /install /quiet /norestart before_build: diff --git a/src/google/protobuf/util/internal/json_stream_parser_test.cc b/src/google/protobuf/util/internal/json_stream_parser_test.cc index b30d529f..d162667a 100644 --- a/src/google/protobuf/util/internal/json_stream_parser_test.cc +++ b/src/google/protobuf/util/internal/json_stream_parser_test.cc @@ -318,15 +318,15 @@ TEST_F(JsonStreamParserTest, ObjectKeyTypes) { // - array containing array, object, values (true, false, null, num, string) TEST_F(JsonStreamParserTest, ArrayValues) { StringPiece str = - "[true, false, null, 'a string', \"another string\", [22, -127, 45.3, " + "[true, false, null, 'a', \"an\", [22, -127, 45.3, " "-1056.4, 11779497823553162765], {'key': true}]"; for (int i = 0; i <= str.length(); ++i) { ow_.StartList("") ->RenderBool("", true) ->RenderBool("", false) ->RenderNull("") - ->RenderString("", "a string") - ->RenderString("", "another string") + ->RenderString("", "a") + ->RenderString("", "an") ->StartList("") ->RenderUint64("", 22) ->RenderInt64("", -127) |