aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow conformance test runner to tolerate crashes, and re-enable conformance ↵Josh Haberman2016-01-1112-55/+760
| | | | tests.
* Merge pull request #1046 from peternewman/patch-1Feng Xiao2016-01-111-2/+1
|\ | | | | Add the docs claimed define for HAVE_UNORDERED_MAP
| * Revert the change and remove an incorrect commentPeter Newman2016-01-091-5/+1
| |
| * Add the docs claimed define for HAVE_UNORDERED_MAPPeter Newman2015-12-151-0/+3
| | | | | | Make the code match what the docs claimed, to return a define for HAVE_UNORDERED_MAP
* | Merge pull request #1124 from xfxyjwf/appveyorFeng Xiao2016-01-091-1/+1
|\ \ | | | | | | Fix appveyor build.
| * | Fix appveyor build.Feng Xiao2016-01-091-1/+1
|/ /
* | Merge pull request #1098 from jskeet/wkt-jsonJan Tattermusch2016-01-083-63/+55
|\ \ | | | | | | Ensure all formatted well-known-type values are valid JSON
| * | Ensure all formatted well-known-type values are valid JSONJon Skeet2016-01-063-63/+55
| | | | | | | | | | | | | | | | | | | | | This involves quoting timestamp/duration/field-mask values, even when they're not in fields. It's better for consistency. Fixes issue #1097.
* | | Merge pull request #1088 from jskeet/codec-pruningJan Tattermusch2016-01-081-5/+0
|\ \ \ | | | | | | | | Remove unused method in FieldCodec.
| * | | Remove unused method in FieldCodec.Jon Skeet2016-01-051-5/+0
| | | | | | | | | | | | | | | | (The method was last used a very long time ago, if ever.)
* | | | Merge pull request #1087 from jskeet/json-testsJan Tattermusch2016-01-082-51/+91
|\ \ \ \ | | | | | | | | | | Improve number handling in JSON parsing
| * | | | Improve number handling in JSON parsingJon Skeet2016-01-062-51/+91
| | |/ / | |/| | | | | | | | | | | | | | | | | | - Tighten up on Infinity/NaN handling in terms of whitespace handling (and test casing) - Validate that values are genuinely integers when they've been parsed from a JSON number (ignoring the fact that 1.0000000000000000001 == 1 as a double...) - Allow exponents and decimal points in string representations
* | | | Merge pull request #1120 from gitplaneta/masterFeng Xiao2016-01-081-1/+1
|\ \ \ \ | | | | | | | | | | Update README.md - remove typo
| * | | | Update README.md - remove typoRadoslaw Busz2016-01-081-1/+1
|/ / / /
* | | | Merge pull request #1101 from xfxyjwf/docFeng Xiao2016-01-073-243/+30
|\ \ \ \ | | | | | | | | | | Update README.md and remove INSTALL.txt
| * | | | Update README.md and remove INSTALL.txtFeng Xiao2016-01-063-243/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added instructions on what tools to install to compile protobuf from source. Removed the INSTALL.txt file because it's just a simple copy of the autoconf documentation and confuses users. Change-Id: I6fd8aa13495f1238fe5c62451b95ad480b1c4bed
* | | | | Merge pull request #1118 from thomasvl/xcode_scheme_cleanupThomas Van Lenten2016-01-072-6/+6
|\ \ \ \ \ | |/ / / / |/| | | | Remove the stale reference to test no longer around, and keep the performance test limited to just performance tests.
| * | | | Remove the stale reference to test no longer around, and keep the ↵Thomas Van Lenten2016-01-072-6/+6
|/ / / / | | | | | | | | | | | | performance test limited to just performance tests.
* | | | Patch internal change 111557819.Feng Xiao2016-01-066-4/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Defer calls to mutable_unknown_fields() until it is actually required to save memory for C++ lite runtime. Change-Id: Ica9c1fd276cdb164942d1e7b6e098c83ee3ffdc5
* | | | Merge pull request #1100 from xfxyjwf/javadocFeng Xiao2016-01-063-6/+6
|\ \ \ \ | | | | | | | | | | Update version number and fix javadoc errors.
| * | | | Update version number and fix javadoc errors.Feng Xiao2016-01-063-6/+6
| | | | |
* | | | | Merge pull request #1094 from thomasvl/update_objc_conformanceThomas Van Lenten2016-01-063-108/+16
|\ \ \ \ \ | |_|/ / / |/| | | | Fix up the conformance tests
| * | | | Fix up the conformance testsThomas Van Lenten2016-01-053-108/+16
|/ / / / | | | | | | | | | | | | | | | | - Update all the new runner cases to handle a skip result as a skip and not a failure. - Make ObjC use the new serialize_error result if it fails to generate the data.
* | | | Merge pull request #1093 from thomasvl/fix_objcThomas Van Lenten2016-01-051-0/+13
|\ \ \ \ | | | | | | | | | | Update objectivec/google/protobuf/Type.pbobjc.m
| * | | | Update objectivec/google/protobuf/Type.pbobjc.mThomas Van Lenten2016-01-051-0/+13
|/ / / / | | | | | | | | | | | | | | | | commit e841bac4fcf47f809e089a70d5f84ac37b3883df seems to have updated the generated .pbobjc.h but not the .pbobjc.m to match.
* | | | Merge pull request #1092 from thomasvl/fix_conformanceThomas Van Lenten2016-01-051-3/+0
|\ \ \ \ | | | | | | | | | | Fix conformance test to only report skips in verbose mode.
| * | | | Fix conformance test to only report skips in verbose mode.Thomas Van Lenten2016-01-051-3/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | commit e841bac4fcf47f809e089a70d5f84ac37b3883df seems to have mis-merged the change to reporting skipped tests. I didn't check if there were other merge issues.
* | | | Merge pull request #1091 from thomasvl/objc_tests_use_autocreatorsThomas Van Lenten2016-01-054-13/+1
|\ \ \ \ | | | | | | | | | | Have the tests rely on the autocreator behaviors.
| * | | | Have the tests rely on the autocreator behaviors.Thomas Van Lenten2016-01-054-13/+1
|/ / / / | | | | | | | | | | | | | | | | Incase developers look at the tests for examples, have them rely on the autocreators also.
* | | | Merge pull request #1085 from jskeet/fix-generationJon Skeet2016-01-052-125/+1301
|\ \ \ \ | | |/ / | |/| | Fix C# source generation shell script and remove out of date notes
| * | | Fix C# source generation shell script and remove out of date notesJon Skeet2016-01-042-125/+1301
|/ / / | | | | | | | | | | | | The conformance tests now use types which are part of src/google/protobuf, so we need to include src in the proto path. The notes around "fix-ups" have been out of date for some time now.
* | | Merge pull request #1081 from haberman/fix-py3Joshua Haberman2015-12-313-91/+152
|\ \ \ | |/ / |/| | Fixes for Python 3.
| * | Fixed compile for Python 3. There are still some crashes though.Josh Haberman2015-12-303-91/+152
|/ /
* | Add changelog for v3.0.0-beta-2.v3.0.0-beta-2Feng Xiao2015-12-301-0/+61
| | | | | | | | | | | | [skip ci] Change-Id: Id383944dd3c999ad1008345ef34c9bdae24abc7c
* | Fix for Visual Studio 2008.Feng Xiao2015-12-304-35/+27
| |
* | Require six>=1.9 for Python.Feng Xiao2015-12-292-2/+2
| | | | | | | | | | | | | | | | | | We use six sub-modules that aren't available in old versions. Not specifying this requirement in the setup will lead to much less readable runtime errors. It's particuarlly problematic for Mac OSX users because the system comes with an old six version 1.4.1 by default. [skip ci]
* | Update BUILD/cmake files.Feng Xiao2015-12-283-3/+9
| | | | | | | | Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d
* | Fix a misplaced macro.Feng Xiao2015-12-281-5/+5
| | | | | | | | Change-Id: Ife609e073bd142d328b680c753f543bb18f4f66d
* | Add js to post_process_dist.sh.Feng Xiao2015-12-281-1/+1
| | | | | | | | Change-Id: I1ee87c49481bcc545939745ccf0a53d766a01a4c
* | Fix a compiler warning.Feng Xiao2015-12-281-0/+2
| | | | | | | | Change-Id: I4c4e2a4a248e4336fef735f75ff5648d8d33627e
* | Add missing files to EXTRA_DIST.Feng Xiao2015-12-2810-279/+83
| | | | | | | | Also delete some unused files.
* | Merge pull request #1071 from haberman/js-testsFeng Xiao2015-12-288-1/+135
|\ \ | | | | | | Enabled JavaScript tests and added README.md.
| * | Fixed test command for JS tests.Josh Haberman2015-12-281-1/+1
| | |
| * | Fixed version number and testing command.Josh Haberman2015-12-221-2/+2
| | |
| * | Added README and enabled JavaScript tests on Node.jsJosh Haberman2015-12-218-1/+135
|/ /
* | Disable python conformnace tests as well.Feng Xiao2015-12-211-2/+4
| | | | | | | | | | | | The testee program crashes on some inputs. Change-Id: Iab27b80e29b7a56c5bd7cb4724531ecf9bb2823a
* | Fix Python 2.6 test failures.Feng Xiao2015-12-211-1/+5
| | | | | | | | Change-Id: Ia9e2795b1ff1abb30410ffb3ef96ba6f46dd99d0
* | Disable conformance tests for csharp and ruby.Feng Xiao2015-12-212-4/+8
| | | | | | | | The testee program of these two languages crashes on some test input.
* | Update version numbers.Feng Xiao2015-12-214-4/+4
| | | | | | | | | | Version number for beta languages is updated to v3.0.0-beta-2. Version number for alpha languages is updated to v3.0.0-alpha-5.
* | Build Java conformance tests for JDK7 only.Feng Xiao2015-12-211-1/+9
| | | | | | | | | | | | The Java conformance test class uses JDK7+ only syntaxes and can't compile with JDK6. [skip ci]