You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/01/20 18:42:22 UTC
[1/2] git commit: THRIFT-1810 add ruby to test/test.sh initial
version without cross language checks
Updated Branches:
refs/heads/master 0e8148024 -> 9aa08a9f6
THRIFT-1810 add ruby to test/test.sh
initial version without cross language checks
Signed-off-by: Roger Meier <ro...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/c95d5dfb
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/c95d5dfb
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/c95d5dfb
Branch: refs/heads/master
Commit: c95d5dfb76631af655f2d905e5e514d5db6078d5
Parents: 0e81480
Author: Roger Meier <ro...@apache.org>
Authored: Sun Jan 19 21:53:02 2014 +0100
Committer: Roger Meier <ro...@apache.org>
Committed: Sun Jan 19 21:53:02 2014 +0100
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/c95d5dfb/test/rb/integration/accelerated_buffered_client.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 7cec1df..f2403c5
--- 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
http://git-wip-us.apache.org/repos/asf/thrift/blob/c95d5dfb/test/rb/integration/accelerated_buffered_server.rb
----------------------------------------------------------------------
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 1ca66e5..af5e601
--- 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,
http://git-wip-us.apache.org/repos/asf/thrift/blob/c95d5dfb/test/rb/integration/buffered_client.rb
----------------------------------------------------------------------
diff --git a/test/rb/integration/buffered_client.rb b/test/rb/integration/buffered_client.rb
old mode 100644
new mode 100755
index 1a925cc..16f6d4e
--- 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
http://git-wip-us.apache.org/repos/asf/thrift/blob/c95d5dfb/test/rb/integration/simple_client.rb
----------------------------------------------------------------------
diff --git a/test/rb/integration/simple_client.rb b/test/rb/integration/simple_client.rb
old mode 100644
new mode 100755
index 1064822..f7516fc
--- 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
http://git-wip-us.apache.org/repos/asf/thrift/blob/c95d5dfb/test/rb/integration/simple_server.rb
----------------------------------------------------------------------
diff --git a/test/rb/integration/simple_server.rb b/test/rb/integration/simple_server.rb
old mode 100644
new mode 100755
index 3518d2e..e543b70
--- 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,
http://git-wip-us.apache.org/repos/asf/thrift/blob/c95d5dfb/test/rb/integration/test_simple_handler.rb
----------------------------------------------------------------------
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 c34aa7e..c056139
--- 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,
http://git-wip-us.apache.org/repos/asf/thrift/blob/c95d5dfb/test/test.sh
----------------------------------------------------------------------
diff --git a/test/test.sh b/test/test.sh
index bec3d22..e3fc46d 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/2] git commit: THRIFT-1810 add ruby to test/test.sh initial
version without cross language checks
Posted by ro...@apache.org.
THRIFT-1810 add ruby to test/test.sh
initial version without cross language checks
Signed-off-by: Roger Meier <ro...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/9aa08a9f
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/9aa08a9f
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/9aa08a9f
Branch: refs/heads/master
Commit: 9aa08a9f6849f5c71aa3e7d1ba493521a11d026c
Parents: c95d5df
Author: Roger Meier <ro...@apache.org>
Authored: Mon Jan 20 18:41:48 2014 +0100
Committer: Roger Meier <ro...@apache.org>
Committed: Mon Jan 20 18:41:48 2014 +0100
----------------------------------------------------------------------
test/test.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/9aa08a9f/test/test.sh
----------------------------------------------------------------------
diff --git a/test/test.sh b/test/test.sh
index e3fc46d..520a632 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -237,7 +237,7 @@ 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" \
+do_test "rb-rb" "binary-accl" "buffered-ip" \
"ruby rb/integration/accelerated_buffered_client.rb" \
"ruby rb/integration/accelerated_buffered_server.rb" \
"1" "5"