Index: third_party/protobuf/conformance/Makefile.am |
diff --git a/third_party/protobuf/conformance/Makefile.am b/third_party/protobuf/conformance/Makefile.am |
index c2b5890039841604700bf656519b9c74203a9b14..31a9e40868bd00cbd88b5eda1b574c9e6b46f297 100644 |
--- a/third_party/protobuf/conformance/Makefile.am |
+++ b/third_party/protobuf/conformance/Makefile.am |
@@ -1,8 +1,7 @@ |
## Process this file with automake to produce Makefile.in |
conformance_protoc_inputs = \ |
- conformance.proto \ |
- $(top_srcdir)/src/google/protobuf/test_messages_proto3.proto |
+ conformance.proto |
well_known_type_protoc_inputs = \ |
$(top_srcdir)/src/google/protobuf/any.proto \ |
@@ -21,7 +20,7 @@ other_language_protoc_outputs = \ |
conformance_pb2.py \ |
Conformance.pbobjc.h \ |
Conformance.pbobjc.m \ |
- conformance_pb.rb \ |
+ conformance.rb \ |
com/google/protobuf/Any.java \ |
com/google/protobuf/AnyOrBuilder.java \ |
com/google/protobuf/AnyProto.java \ |
@@ -62,7 +61,6 @@ other_language_protoc_outputs = \ |
com/google/protobuf/Value.java \ |
com/google/protobuf/ValueOrBuilder.java \ |
com/google/protobuf/WrappersProto.java \ |
- com/google/protobuf_test_messages/proto3/TestMessagesProto3.java \ |
google/protobuf/any.pb.cc \ |
google/protobuf/any.pb.h \ |
google/protobuf/any.rb \ |
@@ -79,12 +77,6 @@ other_language_protoc_outputs = \ |
google/protobuf/struct.pb.h \ |
google/protobuf/struct.rb \ |
google/protobuf/struct_pb2.py \ |
- google/protobuf/TestMessagesProto3.pbobjc.h \ |
- google/protobuf/TestMessagesProto3.pbobjc.m \ |
- google/protobuf/test_messages_proto3.pb.cc \ |
- google/protobuf/test_messages_proto3.pb.h \ |
- google/protobuf/test_messages_proto3_pb.rb \ |
- google/protobuf/test_messages_proto3_pb2.py \ |
google/protobuf/timestamp.pb.cc \ |
google/protobuf/timestamp.pb.h \ |
google/protobuf/timestamp.rb \ |
@@ -92,47 +84,47 @@ other_language_protoc_outputs = \ |
google/protobuf/wrappers.pb.cc \ |
google/protobuf/wrappers.pb.h \ |
google/protobuf/wrappers.rb \ |
- google/protobuf/wrappers_pb2.py |
- # lite/com/google/protobuf/Any.java \ |
- # lite/com/google/protobuf/AnyOrBuilder.java \ |
- # lite/com/google/protobuf/AnyProto.java \ |
- # lite/com/google/protobuf/BoolValue.java \ |
- # lite/com/google/protobuf/BoolValueOrBuilder.java \ |
- # lite/com/google/protobuf/BytesValue.java \ |
- # lite/com/google/protobuf/BytesValueOrBuilder.java \ |
- # lite/com/google/protobuf/conformance/Conformance.java \ |
- # lite/com/google/protobuf/DoubleValue.java \ |
- # lite/com/google/protobuf/DoubleValueOrBuilder.java \ |
- # lite/com/google/protobuf/Duration.java \ |
- # lite/com/google/protobuf/DurationOrBuilder.java \ |
- # lite/com/google/protobuf/DurationProto.java \ |
- # lite/com/google/protobuf/FieldMask.java \ |
- # lite/com/google/protobuf/FieldMaskOrBuilder.java \ |
- # lite/com/google/protobuf/FieldMaskProto.java \ |
- # lite/com/google/protobuf/FloatValue.java \ |
- # lite/com/google/protobuf/FloatValueOrBuilder.java \ |
- # lite/com/google/protobuf/Int32Value.java \ |
- # lite/com/google/protobuf/Int32ValueOrBuilder.java \ |
- # lite/com/google/protobuf/Int64Value.java \ |
- # lite/com/google/protobuf/Int64ValueOrBuilder.java \ |
- # lite/com/google/protobuf/ListValue.java \ |
- # lite/com/google/protobuf/ListValueOrBuilder.java \ |
- # lite/com/google/protobuf/NullValue.java \ |
- # lite/com/google/protobuf/StringValue.java \ |
- # lite/com/google/protobuf/StringValueOrBuilder.java \ |
- # lite/com/google/protobuf/Struct.java \ |
- # lite/com/google/protobuf/StructOrBuilder.java \ |
- # lite/com/google/protobuf/StructProto.java \ |
- # lite/com/google/protobuf/Timestamp.java \ |
- # lite/com/google/protobuf/TimestampOrBuilder.java \ |
- # lite/com/google/protobuf/TimestampProto.java \ |
- # lite/com/google/protobuf/UInt32Value.java \ |
- # lite/com/google/protobuf/UInt32ValueOrBuilder.java \ |
- # lite/com/google/protobuf/UInt64Value.java \ |
- # lite/com/google/protobuf/UInt64ValueOrBuilder.java \ |
- # lite/com/google/protobuf/Value.java \ |
- # lite/com/google/protobuf/ValueOrBuilder.java \ |
- # lite/com/google/protobuf/WrappersProto.java |
+ google/protobuf/wrappers_pb2.py \ |
+ lite/com/google/protobuf/Any.java \ |
+ lite/com/google/protobuf/AnyOrBuilder.java \ |
+ lite/com/google/protobuf/AnyProto.java \ |
+ lite/com/google/protobuf/BoolValue.java \ |
+ lite/com/google/protobuf/BoolValueOrBuilder.java \ |
+ lite/com/google/protobuf/BytesValue.java \ |
+ lite/com/google/protobuf/BytesValueOrBuilder.java \ |
+ lite/com/google/protobuf/conformance/Conformance.java \ |
+ lite/com/google/protobuf/DoubleValue.java \ |
+ lite/com/google/protobuf/DoubleValueOrBuilder.java \ |
+ lite/com/google/protobuf/Duration.java \ |
+ lite/com/google/protobuf/DurationOrBuilder.java \ |
+ lite/com/google/protobuf/DurationProto.java \ |
+ lite/com/google/protobuf/FieldMask.java \ |
+ lite/com/google/protobuf/FieldMaskOrBuilder.java \ |
+ lite/com/google/protobuf/FieldMaskProto.java \ |
+ lite/com/google/protobuf/FloatValue.java \ |
+ lite/com/google/protobuf/FloatValueOrBuilder.java \ |
+ lite/com/google/protobuf/Int32Value.java \ |
+ lite/com/google/protobuf/Int32ValueOrBuilder.java \ |
+ lite/com/google/protobuf/Int64Value.java \ |
+ lite/com/google/protobuf/Int64ValueOrBuilder.java \ |
+ lite/com/google/protobuf/ListValue.java \ |
+ lite/com/google/protobuf/ListValueOrBuilder.java \ |
+ lite/com/google/protobuf/NullValue.java \ |
+ lite/com/google/protobuf/StringValue.java \ |
+ lite/com/google/protobuf/StringValueOrBuilder.java \ |
+ lite/com/google/protobuf/Struct.java \ |
+ lite/com/google/protobuf/StructOrBuilder.java \ |
+ lite/com/google/protobuf/StructProto.java \ |
+ lite/com/google/protobuf/Timestamp.java \ |
+ lite/com/google/protobuf/TimestampOrBuilder.java \ |
+ lite/com/google/protobuf/TimestampProto.java \ |
+ lite/com/google/protobuf/UInt32Value.java \ |
+ lite/com/google/protobuf/UInt32ValueOrBuilder.java \ |
+ lite/com/google/protobuf/UInt64Value.java \ |
+ lite/com/google/protobuf/UInt64ValueOrBuilder.java \ |
+ lite/com/google/protobuf/Value.java \ |
+ lite/com/google/protobuf/ValueOrBuilder.java \ |
+ lite/com/google/protobuf/WrappersProto.java |
bin_PROGRAMS = conformance-test-runner conformance-cpp |
@@ -160,7 +152,7 @@ conformance_test_runner_SOURCES = conformance_test.h conformance_test.cc \ |
conformance_test_runner.cc \ |
third_party/jsoncpp/json.h \ |
third_party/jsoncpp/jsoncpp.cpp |
-nodist_conformance_test_runner_SOURCES = conformance.pb.cc google/protobuf/test_messages_proto3.pb.cc |
+nodist_conformance_test_runner_SOURCES = conformance.pb.cc |
conformance_test_runner_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir) |
conformance_test_runner_CXXFLAGS = -std=c++11 |
# Explicit deps beacuse BUILT_SOURCES are only done before a "make all/check" |
@@ -170,7 +162,7 @@ conformance_test_runner-conformance_test_runner.$(OBJEXT): conformance.pb.h |
conformance_cpp_LDADD = $(top_srcdir)/src/libprotobuf.la |
conformance_cpp_SOURCES = conformance_cpp.cc |
-nodist_conformance_cpp_SOURCES = conformance.pb.cc google/protobuf/test_messages_proto3.pb.cc |
+nodist_conformance_cpp_SOURCES = conformance.pb.cc |
conformance_cpp_CPPFLAGS = -I$(top_srcdir)/src |
# Explicit dep beacuse BUILT_SOURCES are only done before a "make all/check" |
# so a direct "make test_cpp" could fail if parallel enough. |
@@ -181,7 +173,7 @@ if OBJC_CONFORMANCE_TEST |
bin_PROGRAMS += conformance-objc |
conformance_objc_SOURCES = conformance_objc.m ../objectivec/GPBProtocolBuffers.m |
-nodist_conformance_objc_SOURCES = Conformance.pbobjc.m google/protobuf/TestMessagesProto3.pbobjc.m |
+nodist_conformance_objc_SOURCES = Conformance.pbobjc.m |
# On travis, the build fails without the isysroot because whatever system |
# headers are being found don't include generics support for |
# NSArray/NSDictionary, the only guess is their image at one time had an odd |
@@ -190,7 +182,7 @@ conformance_objc_CPPFLAGS = -I$(top_srcdir)/objectivec -isysroot `xcrun --sdk ma |
conformance_objc_LDFLAGS = -framework Foundation |
# Explicit dep beacuse BUILT_SOURCES are only done before a "make all/check" |
# so a direct "make test_objc" could fail if parallel enough. |
-conformance_objc-conformance_objc.$(OBJEXT): Conformance.pbobjc.h google/protobuf/TestMessagesProto3.pbobjc.h |
+conformance_objc-conformance_objc.$(OBJEXT): Conformance.pbobjc.h |
endif |
@@ -200,7 +192,7 @@ if USE_EXTERNAL_PROTOC |
protoc_middleman: $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) |
$(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_out=. --objc_out=. --python_out=. $(conformance_protoc_inputs) |
$(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_out=. --python_out=. $(well_known_type_protoc_inputs) |
- ## $(PROTOC) -I$(srcdir) -I$(top_srcdir) --java_out=lite:lite $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) |
+ $(PROTOC) -I$(srcdir) -I$(top_srcdir) --java_out=lite:lite $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) |
touch protoc_middleman |
else |
@@ -211,8 +203,8 @@ else |
protoc_middleman: $(top_srcdir)/src/protoc$(EXEEXT) $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) |
oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --objc_out=$$oldpwd --python_out=$$oldpwd $(conformance_protoc_inputs) ) |
oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --python_out=$$oldpwd $(well_known_type_protoc_inputs) ) |
- ## @mkdir -p lite |
- ## oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --java_out=lite:$$oldpwd/lite $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) ) |
+ @mkdir -p lite |
+ oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --java_out=lite:$$oldpwd/lite $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) ) |
touch protoc_middleman |
endif |
@@ -229,7 +221,7 @@ MAINTAINERCLEANFILES = \ |
Makefile.in |
javac_middleman: ConformanceJava.java protoc_middleman $(other_language_protoc_outputs) |
- jar=`ls ../java/util/target/*jar-with-dependencies.jar` && javac -classpath ../java/target/classes:$$jar ConformanceJava.java com/google/protobuf/conformance/Conformance.java com/google/protobuf_test_messages/proto3/TestMessagesProto3.java |
+ jar=`ls ../java/util/target/*jar-with-dependencies.jar` && javac -classpath ../java/target/classes:$$jar ConformanceJava.java com/google/protobuf/conformance/Conformance.java |
@touch javac_middleman |
conformance-java: javac_middleman |
@@ -254,36 +246,36 @@ conformance-java-lite: javac_middleman_lite |
conformance-csharp: $(other_language_protoc_outputs) |
@echo "Writing shortcut script conformance-csharp..." |
@echo '#! /bin/sh' > conformance-csharp |
- @echo 'dotnet ../csharp/src/Google.Protobuf.Conformance/bin/Release/netcoreapp1.0/Google.Protobuf.Conformance.dll "$$@"' >> conformance-csharp |
+ @echo 'mono ../csharp/src/Google.Protobuf.Conformance/bin/Release/Google.Protobuf.Conformance.exe "$$@"' >> conformance-csharp |
@chmod +x conformance-csharp |
# Targets for actually running tests. |
test_cpp: protoc_middleman conformance-test-runner conformance-cpp |
- ./conformance-test-runner --enforce_recommended --failure_list failure_list_cpp.txt ./conformance-cpp |
+ ./conformance-test-runner --failure_list failure_list_cpp.txt ./conformance-cpp |
test_java: protoc_middleman conformance-test-runner conformance-java |
- ./conformance-test-runner --enforce_recommended --failure_list failure_list_java.txt ./conformance-java |
+ ./conformance-test-runner --failure_list failure_list_java.txt ./conformance-java |
test_java_lite: protoc_middleman conformance-test-runner conformance-java-lite |
- ./conformance-test-runner --enforce_recommended ./conformance-java-lite |
+ ./conformance-test-runner ./conformance-java-lite |
test_csharp: protoc_middleman conformance-test-runner conformance-csharp |
- ./conformance-test-runner --enforce_recommended --failure_list failure_list_csharp.txt ./conformance-csharp |
+ ./conformance-test-runner --failure_list failure_list_csharp.txt ./conformance-csharp |
test_ruby: protoc_middleman conformance-test-runner $(other_language_protoc_outputs) |
- RUBYLIB=../ruby/lib:. ./conformance-test-runner --enforce_recommended --failure_list failure_list_ruby.txt ./conformance_ruby.rb |
+ RUBYLIB=../ruby/lib:. ./conformance-test-runner --failure_list failure_list_ruby.txt ./conformance_ruby.rb |
# These depend on library paths being properly set up. The easiest way to |
# run them is to just use "tox" from the python dir. |
test_python: protoc_middleman conformance-test-runner |
- ./conformance-test-runner --enforce_recommended --failure_list failure_list_python.txt ./conformance_python.py |
+ ./conformance-test-runner --failure_list failure_list_python.txt $(CONFORMANCE_PYTHON_EXTRA_FAILURES) ./conformance_python.py |
test_python_cpp: protoc_middleman conformance-test-runner |
- ./conformance-test-runner --enforce_recommended --failure_list failure_list_python_cpp.txt ./conformance_python.py |
+ ./conformance-test-runner --failure_list failure_list_python_cpp.txt $(CONFORMANCE_PYTHON_EXTRA_FAILURES) ./conformance_python.py |
if OBJC_CONFORMANCE_TEST |
test_objc: protoc_middleman conformance-test-runner conformance-objc |
- ./conformance-test-runner --enforce_recommended --failure_list failure_list_objc.txt ./conformance-objc |
+ ./conformance-test-runner --failure_list failure_list_objc.txt ./conformance-objc |
endif |