From c95d5dfb76631af655f2d905e5e514d5db6078d5 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Sun, 19 Jan 2014 21:53:02 +0100 Subject: [PATCH] THRIFT-1810 add ruby to test/test.sh initial version without cross language checks Signed-off-by: Roger Meier --- test/rb/integration/accelerated_buffered_client.rb | 5 +++-- test/rb/integration/accelerated_buffered_server.rb | 7 +++---- test/rb/integration/buffered_client.rb | 5 +++-- test/rb/integration/simple_client.rb | 5 +++-- test/rb/integration/simple_server.rb | 6 +++--- test/rb/integration/test_simple_handler.rb | 5 +++-- test/test.sh | 9 ++++++++- 7 files changed, 26 insertions(+), 16 deletions(-) mode change 100644 => 100755 test/rb/integration/accelerated_buffered_client.rb mode change 100644 => 100755 test/rb/integration/accelerated_buffered_server.rb mode change 100644 => 100755 test/rb/integration/buffered_client.rb mode change 100644 => 100755 test/rb/integration/simple_client.rb mode change 100644 => 100755 test/rb/integration/simple_server.rb mode change 100644 => 100755 test/rb/integration/test_simple_handler.rb diff --git a/test/rb/integration/accelerated_buffered_client.rb b/test/rb/integration/accelerated_buffered_client.rb old mode 100644 new mode 100755 index 7cec1df5..f2403c5f --- a/test/rb/integration/accelerated_buffered_client.rb +++ b/test/rb/integration/accelerated_buffered_client.rb @@ -17,10 +17,11 @@ # under the License. # -require File.join(File.dirname(__FILE__), '../test_helper') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class AcceleratedBufferedClientTest < Test::Unit::TestCase def setup diff --git a/test/rb/integration/accelerated_buffered_server.rb b/test/rb/integration/accelerated_buffered_server.rb old mode 100644 new mode 100755 index 1ca66e54..af5e6019 --- a/test/rb/integration/accelerated_buffered_server.rb +++ b/test/rb/integration/accelerated_buffered_server.rb @@ -17,12 +17,11 @@ # under the License. # -$:.push File.dirname(__FILE__) + '/../gen-rb' -$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/lib') -$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/ext') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class SimpleHandler [:testString, :testByte, :testI32, :testI64, :testDouble, diff --git a/test/rb/integration/buffered_client.rb b/test/rb/integration/buffered_client.rb old mode 100644 new mode 100755 index 1a925ccf..16f6d4e9 --- a/test/rb/integration/buffered_client.rb +++ b/test/rb/integration/buffered_client.rb @@ -17,10 +17,11 @@ # under the License. # -require File.join(File.dirname(__FILE__), '../test_helper') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class BufferedClientTest < Test::Unit::TestCase def setup diff --git a/test/rb/integration/simple_client.rb b/test/rb/integration/simple_client.rb old mode 100644 new mode 100755 index 1064822a..f7516fc6 --- a/test/rb/integration/simple_client.rb +++ b/test/rb/integration/simple_client.rb @@ -17,10 +17,11 @@ # under the License. # -require File.join(File.dirname(__FILE__), '../test_helper') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class SimpleClientTest < Test::Unit::TestCase def setup diff --git a/test/rb/integration/simple_server.rb b/test/rb/integration/simple_server.rb old mode 100644 new mode 100755 index 3518d2e1..e543b70c --- a/test/rb/integration/simple_server.rb +++ b/test/rb/integration/simple_server.rb @@ -17,11 +17,11 @@ # under the License. # -$:.push File.dirname(__FILE__) + '/../gen-rb' -$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/lib') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class SimpleHandler [:testString, :testByte, :testI32, :testI64, :testDouble, diff --git a/test/rb/integration/test_simple_handler.rb b/test/rb/integration/test_simple_handler.rb old mode 100644 new mode 100755 index c34aa7e5..c0561391 --- a/test/rb/integration/test_simple_handler.rb +++ b/test/rb/integration/test_simple_handler.rb @@ -17,10 +17,11 @@ # under the License. # -require File.join(File.dirname(__FILE__), '../test_helper') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class TestHandler [:testString, :testByte, :testI32, :testI64, :testDouble, diff --git a/test/test.sh b/test/test.sh index bec3d22f..e3fc46d6 100755 --- a/test/test.sh +++ b/test/test.sh @@ -233,5 +233,12 @@ do_test "cpp-nodejs" "binary" "framed-ip" \ "cpp/TestClient --transport=framed" \ "make -C nodejs/ server" \ "1" "5" - +do_test "rb-rb" "binary" "buffered-ip" \ + "ruby rb/integration/simple_client.rb" \ + "ruby rb/integration/simple_server.rb" \ + "1" "5" +do_test "rb-rb" "binary-accel" "buffered-ip" \ + "ruby rb/integration/accelerated_buffered_client.rb" \ + "ruby rb/integration/accelerated_buffered_server.rb" \ + "1" "5" cd - -- 2.17.1