Commit Graph

6442 Commits

Author SHA1 Message Date
Adam Cozzette
a0a8c6cd77 Fix Windows builds with future Bazel changes
The bazel-bin/ and bazel-genfiles/ directories are going to be merged
soon. That change was causing some test failures on Windows, and I
believe it is because the logic for locating test data files was getting
confused and mistakenly looking for them under bazel-bin/. This commit
updates that logic to look for a more specific file (descriptor.cc)
which does not appear under any Bazel-related directories.

It sounds like the more official solution is to use the Bazel runfiles
library (i.e. //tools/cpp/runfiles). However, I decided not to do that
because we currently still support multiple build systems, and if we
used a separate solution for Bazel then I suspect we would need even
more #ifdefs in the code to handle the different systems.
2019-03-21 11:07:32 -07:00
Joe Bolinger
5e0812d4b1 Allow Java reserved keywords to be used in extensions (#5709)
* add check for reserved keywords in extensions

* add all reserved keywords

* use string without std::

* add test and update name in lite version

* test updates
2019-03-20 09:50:04 -07:00
Jan Tattermusch
ec3d94819d add System.Memory dependency (#5835)
also add useful Span-based methods for ByteString
2019-03-18 16:28:02 -07:00
Paul Yang
68cd8e8ba2
Merge pull request #5908 from protocolbuffers/revert-5014-iterator-deprecation-fix
Revert "Updating Iterators to be compatible with C++17 in MSVC"
2019-03-18 14:21:05 -07:00
Hao Nguyen
cb8a46b529
Merge pull request #5912 from haon4/contributing
Update CONTRIBUTING.md to recommend applying the appropriate labels
2019-03-18 13:45:57 -07:00
Hao Nguyen
9e620595d4 Update CONTRIBUTING.md to recommend applying the appropriate labels 2019-03-18 13:33:08 -07:00
Paul Yang
12f8fe8911
Revert "Updating Iterators to be compatible with C++17 in MSVC" 2019-03-18 10:02:23 -07:00
Jan Tattermusch
b68a347f56
Merge pull request #5898 from jskeet/non-packable
Make the C# benchmarks non-packable
2019-03-15 11:41:25 +01:00
Jon Skeet
2de68bc33a Make the C# benchmarks non-packable 2019-03-15 09:39:50 +00:00
Jan Tattermusch
f071c9e0f3 fix source stepping by upgrading sourcelink (#5891) 2019-03-14 14:58:35 -07:00
Jan Tattermusch
36fa3c6d4d add missing C# windows presubmit.cfg file (#5894) 2019-03-14 09:47:33 -07:00
Jon Skeet
66fb3ce5fc Add C# benchmark files to EXTRA_DIST in Makefile.am 2019-03-13 15:26:57 +00:00
Jon Skeet
233f4865ee First pass at benchmarking for C# 2019-03-13 15:26:57 +00:00
Jan Tattermusch
db1d4dc4c1
Merge pull request #5876 from jtattermusch/csharp_win_tests
C# testing improvements
2019-03-13 07:27:29 +01:00
David Supplee
93533f780b Add terminating character to zend_lookup_class call (#5871)
* add terminating character

* adjust name length input

* add test cases

* correct script name

* Misc fixes

* add new script to EXTRA_DIST list
2019-03-12 21:30:06 -07:00
myd7349
791b863687 No define strtoll/strtoull for VS2013 and above 2019-03-12 09:08:50 -07:00
Jan Tattermusch
60a889e048 make check for distinct hashcode optional 2019-03-12 08:56:32 -04:00
Jan Tattermusch
d305c2ac4b update csharp_EXTRA_DIST 2019-03-12 05:47:53 -04:00
Jan Tattermusch
e6a22c9777 test all frameworks on windows 2019-03-12 05:17:13 -04:00
Jan Tattermusch
67fee07308 C#: set some dotnet options when testing 2019-03-12 05:16:52 -04:00
Jan Tattermusch
753daae027 use netcoreapp2.1 for testing 2019-03-12 05:16:52 -04:00
Jan Tattermusch
79c32b17ac add scripts for C# windows tests 2019-03-12 05:16:52 -04:00
Thomas Van Lenten
70dc39ed3d Stop enabling more warnings for CXX compiles.
For reasons I don't follow, when passing CXXFLAGS to configure, the build
ends up breaking because something along the way fails to detect C++11
support within the third_party/googletest part of the build.
2019-03-11 16:20:05 -04:00
Sydney Acksman
15fab9109d Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 (#5838)
* Bump target frameworks from netcoreapp1.0 to netcoreapp2.2.
Move global.json up to root of repo, change SDK ver to 2.2.100
Change .net core sdk in dockerfile for kokoro to ver 2.2.100

* Re-add curl install

* Change all exe target to 2.1

* Fix incorrect versions in global.json and Dockerfile

* Downgrade version to 2.1 to match exe targets

* introduce separate testing Dockerfile for C#

* revert changes to the shared Dockerfile

* use netcoreapp2.1 for C# conformance tests

* use language specific dockerfile for testing C#

* Edit compatibility tests script to use parameters instead of file copies

* install dotnet SDK on windows before running the tests

* update csharp_EXTRA_DIST
2019-03-11 13:03:58 -07:00
WilliamWhispell
59284450fa Use fixed size for bool, float and double field in codec (#5810)
* Improve C# serialization performance of repeated fields for primitives.

* Changes based on feedback.

* Change compatibility tests to chec float, bool and double are fixed

* Changes based on feedback.

* In the compute methods use the newly created constants
2019-03-08 14:35:21 -08:00
David Ostrovsky
35c9a5fef3 Bazel: Add dependency to error_prone_annotations
Recently dependency to error_prone_annotations was added to the code,
but only Maven build tool chain was updated.

Closes #5795.
2019-03-08 09:38:28 -08:00
Paul Yang
e75a689f7c
Fix ruby continuous tests (#5853)
* Fix ruby continuous tests

* Fix compatibility test
2019-03-07 17:16:31 -08:00
Paul Yang
f891a16058
Add link to continuous test badges (#5855)
* Add link to continuous test badges

* Add badge for dist_install
2019-03-07 15:50:27 -08:00
Hao Nguyen
f85c823c90
Create test to verify that the dist artifact can be installed. (#5854)
* Add a new test for verifying that the dist package can be installed.
2019-03-07 14:34:28 -08:00
Joshua Haberman
e2dd7403bc
Cleanups to allow for import by Copybara. (#5826)
* Some fixes to make the code work in google3.

* Removed plugin.h.

* Some more fixes to be namespace-independent.

* More fixes for namespace independence.

* A few final fixes.

* Another fix (hide ToUpper from Copybara).

* Fix for charp_unittest.
2019-03-07 12:55:45 -08:00
GitHubGanesh
e41e2dde55 Update mutex.h
This change introduces a CriticalSectionLock class as a lightweight replacement for std::mutex on Windows platforms. std::mutex does not work on Windows XP SP2 with the latest VC++ libraries, because it utilizes the Concurrency Runtime that uses ::GetLogicalProcessorInformation which is only supported on Windows XP SP3 and above.
2019-03-06 20:21:33 -08:00
Joe Bolinger
f4f32a5b68 make tests work on older rubies (#5823) 2019-03-06 18:58:58 -08:00
Joshua Haberman
1568deab40
Revert "Updated upb from defcleanup branch and modified Ruby to use it (#5539)" (#5848)
This reverts commit 37581380fb.
2019-03-06 15:44:38 -08:00
Hao Nguyen
d0f91c863a
Down integrate to Github (#5839)
* Down integrate to github
2019-03-06 12:39:12 -08:00
Joshua Haberman
f5e8ee41dd
PHP updates for new upb APIs (#5604) 2019-03-06 12:04:17 -08:00
Joshua Haberman
37581380fb
Updated upb from defcleanup branch and modified Ruby to use it (#5539) 2019-03-06 10:20:18 -08:00
Markov Vladislav
a1b286e21a Simplify string_values_ vector in default_value_objectwriter 2019-03-06 09:47:07 -08:00
Joe Bolinger
8bdecd7430 remove return 0 (#5840) 2019-03-05 23:01:49 -08:00
Justin Buchanan
2d0183ab58 Emit annotations for generated C++ extension identifiers 2019-03-04 14:16:29 -08:00
NulAsh
6106b7937d Change cerr to cout in PrintHelpText again 2019-03-04 14:00:40 -08:00
Paul Yang
59cc6d01ac
Merge pull request #5820 from protocolbuffers/3.7.x-fix
Merge 3.7.x to master
2019-03-04 13:24:43 -08:00
Bo Yang
cb6fa92ee8 Merge branch '3.7.x' 2019-03-04 10:18:18 -08:00
frrakn
50bd9f0a7c Fix documentation on message differencer. (#5788)
Replaced shortn URL with intended URL.
2019-03-04 10:03:56 -08:00
Joe Bolinger
ae85b457d2 Fix Ruby module name generation when the ruby_package option is used (again) (#5794)
* Revert "Revert "Fix Ruby module name generation when the ruby_package option is used (#5735)""

This reverts commit bb211e851e.

* add new files to Makefile.am
2019-03-02 10:38:10 -08:00
Joe Bolinger
76685c6fae Add frozen checks in Ruby (#5726)
* add frozen checks

* Use rb_check_frozen

* Correct assertion on frozen error message

The second argument for the method assert_raise is the message
to show when the assertion fails. It does not check the error
object's message.
Add an additional assertion that does check the error's message.

* do frozen check first
2019-03-02 10:37:37 -08:00
Joe Bolinger
a6e3ac0db1 Generate extra enum method helpers for Ruby (#5670)
* example with extra enum method

* update expected test output

* slight simplification

* add test for generated enum helpers

* move const helpers to c extension

* more explicit test

* more explicit test

* indent

* add foo test

* add check for _const suffix
2019-03-02 10:36:28 -08:00
Joshua Haberman
3e1bd5b81e
Merge pull request #5014 from Kwizatz/iterator-deprecation-fix
Updating Iterators to be compatible with C++17 in MSVC
2019-02-28 17:11:49 -08:00
Paul Yang
582743bf40
Update version number to 3.7.0 (#5793)
* Update version number to 3.7.0

* Add php/releash.sh to Makefile.am

* Make cpp_distcheck exit on fail
2019-02-28 12:55:14 -08:00
Paul Yang
f2ef7970fe
Merge pull request #5791 from protocolbuffers/revert-5735-ruby-pkg-namespace
Revert "Fix Ruby module name generation when the ruby_package option is used"
2019-02-27 21:40:31 -08:00
Paul Yang
bb211e851e Revert "Fix Ruby module name generation when the ruby_package option is used (#5735)"
This reverts commit 9638dcc340.
2019-02-27 20:56:03 -08:00