diff options
| author |  Josh Haberman <jhaberman@gmail.com> | 2016-01-11 21:10:46 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-01-11 21:16:42 -0800 |
| commit | fc7f8d9cd08cf5954aaa3c36c1be8106972e7fe0 (patch) | |
| tree | 94a50c784f929f173958bc9ef93f2f8c143daff2 /ruby | |
| parent | bf50ec4ac9a9c8646a1d09770dd0972bac1f602d (diff) | |
Fixed Ruby conformance tests by running them under rvm Ruby.
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/Gemfile.lock | 2 | ||||
| -rw-r--r-- | ruby/ext/google/protobuf_c/defs.c | 3 | ||||
| -rwxr-xr-x | ruby/travis-test.sh | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 38f13abd..8599da75 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - google-protobuf (3.0.0.alpha.5.0) + google-protobuf (3.0.0.alpha.4.0) GEM remote: https://rubygems.org/ diff --git a/ruby/ext/google/protobuf_c/defs.c b/ruby/ext/google/protobuf_c/defs.c index 804ca078..7e0cd14c 100644 --- a/ruby/ext/google/protobuf_c/defs.c +++ b/ruby/ext/google/protobuf_c/defs.c @@ -543,8 +543,7 @@ VALUE FieldDescriptor_name_set(VALUE _self, VALUE str) { upb_fieldtype_t ruby_to_fieldtype(VALUE type) { if (TYPE(type) != T_SYMBOL) { - rb_raise(rb_eArgError, "Expected symbol for field type, not: %s (%d)", - RSTRING_PTR(rb_inspect(type)), TYPE(type)); + rb_raise(rb_eArgError, "Expected symbol for field type."); } #define CONVERT(upb, ruby) \ diff --git a/ruby/travis-test.sh b/ruby/travis-test.sh index 4c09d767..75db7d93 100755 --- a/ruby/travis-test.sh +++ b/ruby/travis-test.sh @@ -17,8 +17,8 @@ test_version() { "rvm install $version && rvm use $version && \ which ruby && \ gem install bundler && bundle && \ - rake test" - cd ../conformance && make test_ruby + rake test && + cd ../conformance && make test_ruby" fi } |