diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2015-07-20 11:06:17 -0700 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2015-07-20 11:06:17 -0700 |
commit | aba42edd8c3c5ae4edeebdacd1a3b4192bd5550f (patch) | |
tree | b6f22f84e6109a51b59bf8092e36b69dbe9c6e49 /conformance/Makefile.am | |
parent | 58035596e7864c66008a1f6222dce54031610ff4 (diff) | |
parent | c2c43a4917d7da263e360a4096d6603da8535bdf (diff) | |
download | protobuf-aba42edd8c3c5ae4edeebdacd1a3b4192bd5550f.tar.gz protobuf-aba42edd8c3c5ae4edeebdacd1a3b4192bd5550f.tar.bz2 protobuf-aba42edd8c3c5ae4edeebdacd1a3b4192bd5550f.zip |
Merge pull request #604 from haberman/ruby-conformance
Added Ruby to conformance tests.
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 |