Commit fc7f8d9c authored by Josh Haberman's avatar Josh Haberman

Fixed Ruby conformance tests by running them under rvm Ruby.

parent bf50ec4a
PATH PATH
remote: . remote: .
specs: specs:
google-protobuf (3.0.0.alpha.5.0) google-protobuf (3.0.0.alpha.4.0)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
......
...@@ -543,8 +543,7 @@ VALUE FieldDescriptor_name_set(VALUE _self, VALUE str) { ...@@ -543,8 +543,7 @@ VALUE FieldDescriptor_name_set(VALUE _self, VALUE str) {
upb_fieldtype_t ruby_to_fieldtype(VALUE type) { upb_fieldtype_t ruby_to_fieldtype(VALUE type) {
if (TYPE(type) != T_SYMBOL) { if (TYPE(type) != T_SYMBOL) {
rb_raise(rb_eArgError, "Expected symbol for field type, not: %s (%d)", rb_raise(rb_eArgError, "Expected symbol for field type.");
RSTRING_PTR(rb_inspect(type)), TYPE(type));
} }
#define CONVERT(upb, ruby) \ #define CONVERT(upb, ruby) \
......
...@@ -17,8 +17,8 @@ test_version() { ...@@ -17,8 +17,8 @@ test_version() {
"rvm install $version && rvm use $version && \ "rvm install $version && rvm use $version && \
which ruby && \ which ruby && \
gem install bundler && bundle && \ gem install bundler && bundle && \
rake test" rake test &&
cd ../conformance && make test_ruby cd ../conformance && make test_ruby"
fi fi
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment