diff options
| author | Jon Skeet <skeet@pobox.com> | 2015-07-21 12:58:43 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-07-21 12:58:43 +0100 |
| commit | 2ee4b5665520fe3245eb5e15df8bd35e0c539a07 (patch) | |
| tree | f5e81c7ea4d414c6a388ebc86ab62175240660d1 /conformance/Makefile.am | |
| parent | c792db5d0878871d8f2f78cf12c7e597060088c8 (diff) | |
| parent | 353b7a99857442c7c64a56111b3910b63237ccc8 (diff) | |
| download | protobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.tar.gz protobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.tar.bz2 protobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.zip | |
Merge pull request #629 from google/master
Integrate changes from upstream/master into csharp-experimental
Diffstat (limited to 'conformance/Makefile.am')
| -rw-r--r-- | conformance/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index cccbac9e..97251715 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -22,7 +22,7 @@ conformance_cpp_CPPFLAGS = -I$(top_srcdir)/src if USE_EXTERNAL_PROTOC protoc_middleman: $(protoc_inputs) - $(PROTOC) -I$(srcdir) --cpp_out=. --java_out=. $^ + $(PROTOC) -I$(srcdir) --cpp_out=. --java_out=. --ruby_out=. $^ touch protoc_middleman else @@ -31,7 +31,7 @@ else # relative to srcdir, which may not be the same as the current directory when # building out-of-tree. protoc_middleman: $(top_srcdir)/src/protoc$(EXEEXT) $(protoc_inputs) - oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. --cpp_out=$$oldpwd --java_out=$$oldpwd $(protoc_inputs) ) + oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd $(protoc_inputs) ) touch protoc_middleman endif @@ -61,3 +61,6 @@ test_cpp: protoc_middleman conformance-test-runner conformance-cpp test_java: protoc_middleman conformance-test-runner conformance-java ./conformance-test-runner ./conformance-java + +test_ruby: protoc_middleman conformance-test-runner + RUBYLIB=../ruby/lib:. ./conformance-test-runner --failure_list failure_list_ruby.txt ./conformance_ruby.rb |