From fc7f8d9cd08cf5954aaa3c36c1be8106972e7fe0 Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Mon, 11 Jan 2016 21:10:46 -0800
Subject: Fixed Ruby conformance tests by running them under rvm Ruby.

---
 ruby/Gemfile.lock                 | 2 +-
 ruby/ext/google/protobuf_c/defs.c | 3 +--
 ruby/travis-test.sh               | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'ruby')

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
 }
 
-- 
cgit v1.2.3