aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2016-07-13 16:44:27 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2016-07-13 16:44:27 -0700
commitdd37b992bef77ce9648c5a29a9bce53a17fb5f1f (patch)
treea4b45e19174d3935c396cd78df1aa2fa222d42fc
parent06a02488ce326e4e4dc0c1bd3d66853c5de88d73 (diff)
downloadprotobuf-dd37b992bef77ce9648c5a29a9bce53a17fb5f1f.tar.gz
protobuf-dd37b992bef77ce9648c5a29a9bce53a17fb5f1f.tar.bz2
protobuf-dd37b992bef77ce9648c5a29a9bce53a17fb5f1f.zip
Comment out lite conformance test.
The 'lite' generator flag is no longer supported.
-rw-r--r--conformance/Makefile.am88
1 files changed, 44 insertions, 44 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am
index 5538cc75..64adb7c5 100644
--- a/conformance/Makefile.am
+++ b/conformance/Makefile.am
@@ -84,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
@@ -192,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
@@ -203,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