Fixed Ruby conformance tests by running them under rvm Ruby.

ishay2b · Jan 12, 2016 · fc7f8d9 · fc7f8d9
1 parent bf50ec4
commit fc7f8d9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
 }