aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2016-12-03 11:51:25 -0500
committerGitHub <noreply@github.com>2016-12-03 11:51:25 -0500
commitf1ce60e7b45c16affa4c8a92a9a129755c5fcfd5 (patch)
treeb71a425660fc225154547f542ff1dbe0e342ade3 /Makefile.am
parent4280c2740300f414d95a5f282426f25f5b13e05d (diff)
downloadprotobuf-f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5.tar.gz
protobuf-f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5.tar.bz2
protobuf-f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5.zip
Factored Conformance and Benchmark test messages into shared test schema. (#1971)
* Factored Conformance test messages into shared test schema. * Updated benchmarks to use new proto3 message locations. * Fixed include path. * Conformance: fixed include of Python test messages. * Make maven in Rakefile use --batch-mode. * Revert changes to benchmarks. On second thought I think a separate schema for CPU benchmarking makes sense. * Try regenerating C# protos for new test protos. * Removed benchmark messages from test proto. * Added Jon Skeet's fixes for C#. * Removed duplicate/old test messages C# file. * C# fixes for test schema move. * Fixed C# to use the correct TestAllTypes message. * Fixes for Objective C test schema move. * Added missing EXTRA_DIST file.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 0d8fe103..27343780 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,6 +100,7 @@ csharp_EXTRA_DIST= \
csharp/src/Google.Protobuf.Test/TestCornerCases.cs \
csharp/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs \
csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs \
+ csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs \
csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs \
csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs \
csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs \