summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-25 14:29:02 +0000
committerktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-25 14:29:02 +0000
commit1dafd4ebf1a88e0a8298fe60e7632af8584da29a (patch)
treecd6f90640033c8593f7c1e2e8d85f1bd5320a7be
parent2ee7d727900c023bc31a30efdb763dfa31a1404c (diff)
* test/fiddle/test_c_struct_entry.rb,
test/fiddle/test_c_union_entity.rb, test/fiddle/test_cparser.rb, test/fiddle/test_func.rb, test/fiddle/test_handle.rb, test/fiddle/test_import.rb, test/fiddle/test_pointer.rb: don't run test if the system don't support fiddle. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--test/fiddle/test_c_struct_entry.rb10
-rw-r--r--test/fiddle/test_c_union_entity.rb9
-rw-r--r--test/fiddle/test_cparser.rb10
-rw-r--r--test/fiddle/test_func.rb7
-rw-r--r--test/fiddle/test_handle.rb7
-rw-r--r--test/fiddle/test_import.rb9
-rw-r--r--test/fiddle/test_pointer.rb9
8 files changed, 49 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 2402a853f4..5b7c2dd0ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat May 25 23:22:38 2013 Kazuki Tsujimoto <kazuki@callcc.net>
+
+ * test/fiddle/test_c_struct_entry.rb,
+ test/fiddle/test_c_union_entity.rb,
+ test/fiddle/test_cparser.rb, test/fiddle/test_func.rb,
+ test/fiddle/test_handle.rb, test/fiddle/test_import.rb,
+ test/fiddle/test_pointer.rb: don't run test if the system
+ don't support fiddle.
+
Sat May 25 21:29:34 2013 NARUSE, Yui <naruse@ruby-lang.org>
* ext/pty/pty.c (get_device_once): FreeBSD 10-current and 9-stable
diff --git a/test/fiddle/test_c_struct_entry.rb b/test/fiddle/test_c_struct_entry.rb
index a6cee75eb9..de5449b43d 100644
--- a/test/fiddle/test_c_struct_entry.rb
+++ b/test/fiddle/test_c_struct_entry.rb
@@ -1,6 +1,8 @@
-require_relative 'helper'
-
-require 'fiddle/struct'
+begin
+ require_relative 'helper'
+ require 'fiddle/struct'
+rescue LoadError
+end
module Fiddle
class TestCStructEntity < TestCase
@@ -71,4 +73,4 @@ module Fiddle
assert_equal("Alice", user["name"].to_s)
end
end
-end
+end if defined?(Fiddle)
diff --git a/test/fiddle/test_c_union_entity.rb b/test/fiddle/test_c_union_entity.rb
index d27c9edb52..165c4ecacb 100644
--- a/test/fiddle/test_c_union_entity.rb
+++ b/test/fiddle/test_c_union_entity.rb
@@ -1,6 +1,9 @@
-require_relative 'helper'
+begin
+ require_relative 'helper'
+ require 'fiddle/struct'
+rescue LoadError
+end
-require 'fiddle/struct'
module Fiddle
class TestCUnionEntity < TestCase
@@ -28,4 +31,4 @@ module Fiddle
assert_equal 1, union['int']
end
end
-end
+end if defined?(Fiddle)
diff --git a/test/fiddle/test_cparser.rb b/test/fiddle/test_cparser.rb
index 32ef82fc6e..666d8c89d6 100644
--- a/test/fiddle/test_cparser.rb
+++ b/test/fiddle/test_cparser.rb
@@ -1,6 +1,8 @@
-require_relative 'helper'
-
-require 'fiddle/cparser'
+begin
+ require_relative 'helper'
+ require 'fiddle/cparser'
+rescue LoadError
+end
module Fiddle
class TestCParser < TestCase
@@ -30,4 +32,4 @@ module Fiddle
assert_equal(TYPE_UINTPTR_T, parse_ctype("uintptr_t"))
end
end
-end
+end if defined?(Fiddle)
diff --git a/test/fiddle/test_func.rb b/test/fiddle/test_func.rb
index 92bcd8ed25..529aaa8baf 100644
--- a/test/fiddle/test_func.rb
+++ b/test/fiddle/test_func.rb
@@ -1,4 +1,7 @@
-require_relative 'helper'
+begin
+ require_relative 'helper'
+rescue LoadError
+end
module Fiddle
class TestFunc < TestCase
@@ -86,4 +89,4 @@ module Fiddle
assert_equal("1349", buff, bug4929)
end
end
-end
+end if defined?(Fiddle)
diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
index f11272abbf..6fceff5ea5 100644
--- a/test/fiddle/test_handle.rb
+++ b/test/fiddle/test_handle.rb
@@ -1,4 +1,7 @@
-require_relative 'helper'
+begin
+ require_relative 'helper'
+rescue LoadError
+end
module Fiddle
class TestHandle < TestCase
@@ -183,4 +186,4 @@ module Fiddle
Fiddle.dlopen("/usr/lib/libc.so").sym('strcpy')
end if /freebsd/=~ RUBY_PLATFORM
end
-end
+end if defined?(Fiddle)
diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb
index d792eaf657..62985cfcd3 100644
--- a/test/fiddle/test_import.rb
+++ b/test/fiddle/test_import.rb
@@ -1,6 +1,9 @@
# coding: US-ASCII
-require_relative 'helper'
-require 'fiddle/import'
+begin
+ require_relative 'helper'
+ require 'fiddle/import'
+rescue LoadError
+end
module Fiddle
module LIBC
@@ -134,4 +137,4 @@ module Fiddle
assert_includes(12.00..13.00, r)
end
end
-end
+end if defined?(Fiddle)
diff --git a/test/fiddle/test_pointer.rb b/test/fiddle/test_pointer.rb
index ef33b91062..1d908f64d9 100644
--- a/test/fiddle/test_pointer.rb
+++ b/test/fiddle/test_pointer.rb
@@ -1,5 +1,8 @@
-require_relative 'helper'
-require_relative '../ruby/envutil'
+begin
+ require_relative 'helper'
+ require_relative '../ruby/envutil'
+rescue LoadError
+end
module Fiddle
class TestPointer < TestCase
@@ -228,4 +231,4 @@ module Fiddle
assert_raise(DLError) {nullpo[0] = 1}
end
end
-end
+end if defined?(Fiddle)