From f6b4d188b4e8aaa81c129c5d9c2076de865cae24 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Fri, 23 Sep 2016 21:43:09 +0000 Subject: [PATCH 1/2] Reduce test length to avoid stack overflow on VS. --- .../protobuf/util/internal/json_stream_parser_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 b30d529fd..d162667a7 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) From 73c8723266875edccb2e006774751ebec2864626 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Fri, 23 Sep 2016 15:46:48 -0700 Subject: [PATCH 2/2] Use "appveyor DownloadFile" "ps: StartFileDownload" is broken by a recent appveyor image update: http://help.appveyor.com/discussions/problems/5308-ci-frequently-hangs-with-recent-image-update Change-Id: Ia73aa8b12f77eb9bbec556a4c05310153aad97bf --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 20fc8ade5..08d087b69 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: