Commit Graph

6019 Commits

Author SHA1 Message Date
Jan Tattermusch
7200550afa upport kokoro/release/python from 3.6.x branch 2018-09-07 12:32:20 -07:00
Jan Tattermusch
2e7563f40e
Merge pull request #5123 from jtattermusch/collect_all_artifacts
Add experimental collect_all_artifacts script
2018-09-07 12:23:08 -07:00
Feng Xiao
4b955e69cf
Merge pull request #5111 from kykrueger/master
Update README.md with gradle instructions for java
2018-09-07 12:06:48 -07:00
Jan Tattermusch
9dadb37fb2 experimental collect_all_artifacts script 2018-09-07 09:10:12 -07:00
Paul Yang
5aeee3dc91
Add source dependency of test suite implementation to main function (#5069)
* Fix conformance running nothing issue

This change adds a source dependency of the test suite implementaion
class in the main function. For generality reason, the main function is
moved to the file of the test suite implemetation.  New test suite
implementation will need to implement the main function.
In order to make it easy for test suite implementation to implement the
main function, this change also refactor out the common code out of the
main function.

* Fix typo
2018-09-06 15:02:04 -07:00
Kyle Krueger
21ebeed20a
Update README.md with gradle instructions for java 2018-09-06 09:43:26 +02:00
Joshua Haberman
fd90f45360
Merge pull request #5103 from haberman/cmake
Added conformance test impl file to CMake.
2018-09-02 20:57:46 -07:00
Feng Xiao
37b5617d42
Merge pull request #5099 from oqton/feature/issue-5806
Fixes JSON Loading of Any messages with Unknown Fields  in C++
2018-09-02 20:33:12 -07:00
Joshua Haberman
64f5af2f9c Added conformance test impl file to CMake. 2018-09-02 14:22:52 -07:00
Joshua Haberman
d340bdf508
Merge pull request #5078 from haberman/conformance-cmake
Added cmake build files for the conformance test runner.
2018-09-02 10:07:14 -07:00
Feng Xiao
d42ec0791a
Merge pull request #5092 from xfxyjwf/contrib
Add contributing guidelines.
2018-09-01 08:59:09 -07:00
Paul Yang
d05926861b
Fix well known type class not inheriting Message (#5095)
* Fix well known type class not inheriting Message

Previously, well known types only implement Message interface but not inhert it.
Fix the problem by calling zend_do_inheritance

* Add back commented tests
2018-08-31 10:48:17 -07:00
Paul Yang
98e26a4195
Add missing reference to conformanc_test_impl.cc in Makefile (#5100)
* Add missing reference to conformanc_test_impl.cc in Makefile

* Update conformance failure list
2018-08-31 10:47:58 -07:00
Brandon Cole
52870ad8fd Also make sure known fields come across as expected 2018-08-30 11:45:39 -04:00
Brandon Cole
3d32de9b2c Code fixes for the original unit test.
Credit goes to @mercret for the fix.
2018-08-30 11:32:45 -04:00
Brandon Cole
d83a9f66bc Add unit test for loading unknown fields in Any messages
Use ./tests.sh cpp to run it
2018-08-30 11:04:55 -04:00
Feng Xiao
2102a70e51 Add constributing guidelines. 2018-08-29 15:50:16 -07:00
Feng Xiao
9a8d9b1014
Merge pull request #5082 from elharo/guava
update version
2018-08-29 14:20:31 -07:00
Feng Xiao
0bfe1ca277
Merge pull request #5079 from GobySoft/request-new-extension
Request new option extension (and update URLs for existing projects)
2018-08-29 14:15:33 -07:00
Feng Xiao
86c7786be8
Merge pull request #5077 from EmersonGaziz/patch-1
Update options.md | fix website url for C# port
2018-08-29 14:13:05 -07:00
Elliotte Harold
259331566b update version 2018-08-27 21:54:07 -04:00
Josh Haberman
0e3fa28e47 Added missing file to Makefile.am. 2018-08-24 17:09:50 -07:00
Toby Schneider
4fd7bdee48
Update options.md
Update my projects' (DCCL / Goby) URLs.
Propose new extension for CGSN Mooring project.
2018-08-24 17:10:24 -04:00
Josh Haberman
4249692ce6 Added cmake build files for the conformance test runner.
I want to use the conformance tests from upb, which is switching
to CMake.
2018-08-24 12:27:21 -07:00
Gohar Aziz
f3a74befcd
Update options.md | fix website url for C# port
Update options.md | fix website url for C# port of protocol buffers.. From `http://github.com/jskeet/dotnet-protobufs` to `https://github.com/jskeet/protobuf-csharp-port`
2018-08-24 10:19:22 -04:00
Feng Xiao
45d03a9771
Merge pull request #5074 from xfxyjwf/links
Revert changed links in Dockerfiles.
2018-08-23 16:17:25 -07:00
Feng Xiao
a0a17e24d7 Fix go tests. 2018-08-23 15:35:52 -07:00
Feng Xiao
409f954673 Revert changed links in Dockerfiles.
These changes require building new docker images and without new images
our kokoro tests are all failing.
2018-08-23 12:43:35 -07:00
Feng Xiao
fd4baa91e7
Merge pull request #5068 from xfxyjwf/links
Replace repo links.
2018-08-22 18:32:11 -07:00
Feng Xiao
afe98de32a Replace repo links. 2018-08-22 11:55:30 -07:00
Jon Skeet
228530e2da Support creating FileDescriptors dynamically from binary data.
Related to #658 and #5007.
2018-08-20 22:00:02 +01:00
Feng Xiao
fa252ec2a5
Merge pull request #5024 from greenhouse-org/fix-windows-path
Fix TryCreateParentDirectory on Windows
2018-08-20 13:50:16 -07:00
Feng Xiao
9590dd2c4f
Merge pull request #5050 from lucidsoftware/lucid
Change deprecated Bazel single file attr param
2018-08-20 13:40:02 -07:00
James Judd
d5f0dac497 Change deprecated Bazel single file attr param
This removes the need for --incompatible_disable_deprecated_attr_params
when using Protobuf
2018-08-14 21:55:35 -06:00
Jie Luo
ab09b2a2e2
Disable surrogate check for ucs2 (#5039)
* _SURROGATE_PATTERN check for ucs4
Skip some test for ucs2 by sys.maxunicode
2018-08-14 11:17:16 -07:00
Feng Xiao
fe2eef4bf4
Merge pull request #5042 from dsnet/master
Document wrapper non-uses
2018-08-13 17:49:03 -07:00
Joe Tsai
6b6e155ff9 Document wrapper non-uses
Document the cases where the wrapper well-known types are not useful.
2018-08-13 16:44:47 -07:00
Feng Xiao
d39c7ef6eb
Merge pull request #5033 from xfxyjwf/up
Fix issues discovered in up-integration.
2018-08-13 15:20:48 -07:00
Feng Xiao
fa11dea05b Fix issues discovered in up-integration. 2018-08-13 15:20:04 -07:00
Feng Xiao
f2a326d36e
Merge pull request #5041 from xfxyjwf/bazel
Add status badge for bazel build.
2018-08-13 15:13:41 -07:00
Feng Xiao
b4646ecfff Add status badge for bazel build. 2018-08-13 14:55:52 -07:00
Feng Xiao
2932594145
Merge pull request #5040 from xfxyjwf/bazel
Fix bazel test.
2018-08-13 14:55:11 -07:00
Feng Xiao
bde4eaf137 Update build files.
* Fixes https://github.com/google/protobuf/issues/5031
* Fixes https://github.com/google/protobuf/issues/5037
2018-08-13 14:41:27 -07:00
Feng Xiao
4c70c9cb17
Merge pull request #5038 from xfxyjwf/proto2
Down-integrate proto2 namespace fix.
2018-08-13 14:41:05 -07:00
Sam Smith
bf784289d2 Always spilt on '\' and '/' 2018-08-13 17:17:33 -04:00
Joshua Haberman
585b24e9a6
Merge pull request #5032 from TeBoring/json-wrapper
Fix json parsing of wrapper values
2018-08-13 13:36:08 -07:00
Feng Xiao
14be563f00 Down-integrate proto2 namespace fix. 2018-08-13 12:32:21 -07:00
Bo Yang
e3ee7167f1 Fix json parsing of wrapper values 2018-08-10 18:09:02 +00:00
Yilun Chong
ba8692fbad
Merge pull request #4951 from BSBandme/add_js_benchmark
Add JS and Protobuf.js benchmark, fix js's reader.skipGroup
2018-08-10 11:07:04 -07:00
Feng Xiao
acd5b05e9f Fix failing tests.
1. Fix C++ tests.
  * Add missing files to Makefile.am and fix distcheck in tests.sh
  * Remove BUILT_SOURCES from conformance/Makefile.am.
  * Add some missing override keyword.
  * Add a type cast to int64 because our StrCat() in stubs can't handle size_t.
2. Fix Java tests.
  * Add missing test dependency on guava in pom.xml.
  * Include newly referenced test data in test resources.
  * Manually fix map_lite_test.proto which is overwritten because it's mapped
    from map_test.proto in google3.
  * Add back "optimize_for = LITE_RUNTIME" which is still needed to keep the
    opensource test passing as it's still running lite tests.
  * Add a type cast in newBuilder() because without it the code doesn't compile
    with openjdk javac 1.8 (the compiler can't figure if it's the right type
    due to complex generic typing).
3. Fix Python tests.
  * Remove/replace references to <hash_map>.
  * Suppress more warnings in setup.py.
  * Replace incorrect header inclusion for google/protobuf/proto_api.h.
  * Add strings::EndsWith to google/protobuf/stubs/strutil.h because it's
    referenced in the updated python C extension code.
  * Replace proto2 with google::protobuf. The proto2 name is leaked to
    opensource because we removed the subsitition rule for proto2 namespace
    but only fixed C++ source code and forgot to update python C extension code.
2018-08-09 21:21:01 -07:00