From 0713f89944ecfff3aeefda1edcf44c0ea3e98de0 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Wed, 28 Nov 2012 00:02:49 +0000 Subject: * ext/fiddle/fiddle.c: adding alignment constants for compatibility with DL. * ext/fiddle/fiddle.h: ditto * ext/fiddle/lib/fiddle/cparser.rb: importing the C parser for DL backwards compatibility. * ext/fiddle/lib/fiddle/import.rb: importing the import DSL for DL backwards compatibility. * ext/fiddle/lib/fiddle/pack.rb: importing structure pack for DL backwards compatibility. * ext/fiddle/lib/fiddle/value.rb: ditto * ext/fiddle/lib/fiddle/struct.rb: importing struct DSL for DL backwards compatibility. * test/dl/test_c_struct_entry.rb: importing tests * test/dl/test_c_union_entity.rb: ditto * test/dl/test_cparser.rb: ditto * test/dl/test_import.rb: ditto * test/fiddle/test_c_struct_entry.rb: ditto * test/fiddle/test_c_union_entity.rb: ditto * test/fiddle/test_cparser.rb: ditto * test/fiddle/test_import.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/dl/test_c_struct_entry.rb | 65 +++++++++++++++++++++--------------------- test/dl/test_c_union_entity.rb | 37 ++++++++++++------------ test/dl/test_cparser.rb | 14 ++++----- test/dl/test_import.rb | 8 +++--- 4 files changed, 63 insertions(+), 61 deletions(-) (limited to 'test/dl') diff --git a/test/dl/test_c_struct_entry.rb b/test/dl/test_c_struct_entry.rb index 414f17ba53..a7a0e34644 100644 --- a/test/dl/test_c_struct_entry.rb +++ b/test/dl/test_c_struct_entry.rb @@ -2,52 +2,53 @@ require_relative 'test_base' require 'dl/struct' -class DL::TestCStructEntity < DL::TestBase - def test_class_size - types = [DL::TYPE_DOUBLE, DL::TYPE_CHAR] +module DL + class TestCStructEntity < TestBase + def test_class_size + types = [TYPE_DOUBLE, TYPE_CHAR] - size = DL::CStructEntity.size types + size = CStructEntity.size types - alignments = types.map { |type| DL::PackInfo::ALIGN_MAP[type] } + alignments = types.map { |type| PackInfo::ALIGN_MAP[type] } - expected = DL::PackInfo.align 0, alignments[0] - expected += DL::PackInfo::SIZE_MAP[DL::TYPE_DOUBLE] + expected = PackInfo.align 0, alignments[0] + expected += PackInfo::SIZE_MAP[TYPE_DOUBLE] - expected = DL::PackInfo.align expected, alignments[1] - expected += DL::PackInfo::SIZE_MAP[DL::TYPE_CHAR] + expected = PackInfo.align expected, alignments[1] + expected += PackInfo::SIZE_MAP[TYPE_CHAR] - expected = DL::PackInfo.align expected, alignments.max + expected = PackInfo.align expected, alignments.max - assert_equal expected, size - end + assert_equal expected, size + end - def test_class_size_with_count - size = DL::CStructEntity.size([[DL::TYPE_DOUBLE, 2], [DL::TYPE_CHAR, 20]]) + def test_class_size_with_count + size = CStructEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]]) - types = [DL::TYPE_DOUBLE, DL::TYPE_CHAR] - alignments = types.map { |type| DL::PackInfo::ALIGN_MAP[type] } + types = [TYPE_DOUBLE, TYPE_CHAR] + alignments = types.map { |type| PackInfo::ALIGN_MAP[type] } - expected = DL::PackInfo.align 0, alignments[0] - expected += DL::PackInfo::SIZE_MAP[DL::TYPE_DOUBLE] * 2 + expected = PackInfo.align 0, alignments[0] + expected += PackInfo::SIZE_MAP[TYPE_DOUBLE] * 2 - expected = DL::PackInfo.align expected, alignments[1] - expected += DL::PackInfo::SIZE_MAP[DL::TYPE_CHAR] * 20 + expected = PackInfo.align expected, alignments[1] + expected += PackInfo::SIZE_MAP[TYPE_CHAR] * 20 - expected = DL::PackInfo.align expected, alignments.max + expected = PackInfo.align expected, alignments.max - assert_equal expected, size - end + assert_equal expected, size + end - def test_set_ctypes - union = DL::CStructEntity.malloc [DL::TYPE_INT, DL::TYPE_LONG] - union.assign_names %w[int long] + def test_set_ctypes + union = CStructEntity.malloc [TYPE_INT, TYPE_LONG] + union.assign_names %w[int long] - # this test is roundabout because the stored ctypes are not accessible - union['long'] = 1 - union['int'] = 2 + # this test is roundabout because the stored ctypes are not accessible + union['long'] = 1 + union['int'] = 2 - assert_equal 1, union['long'] - assert_equal 2, union['int'] + assert_equal 1, union['long'] + assert_equal 2, union['int'] + end end end - diff --git a/test/dl/test_c_union_entity.rb b/test/dl/test_c_union_entity.rb index 29b9e1054a..09f7c60e4c 100644 --- a/test/dl/test_c_union_entity.rb +++ b/test/dl/test_c_union_entity.rb @@ -2,29 +2,30 @@ require_relative 'test_base' require 'dl/struct' -class DL::TestCUnionEntity < DL::TestBase - def test_class_size - size = DL::CUnionEntity.size([DL::TYPE_DOUBLE, DL::TYPE_CHAR]) +module DL + class TestCUnionEntity < TestBase + def test_class_size + size = CUnionEntity.size([TYPE_DOUBLE, TYPE_CHAR]) - assert_equal DL::SIZEOF_DOUBLE, size - end + assert_equal SIZEOF_DOUBLE, size + end - def test_class_size_with_count - size = DL::CUnionEntity.size([[DL::TYPE_DOUBLE, 2], [DL::TYPE_CHAR, 20]]) + def test_class_size_with_count + size = CUnionEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]]) - assert_equal DL::SIZEOF_CHAR * 20, size - end + assert_equal SIZEOF_CHAR * 20, size + end - def test_set_ctypes - union = DL::CUnionEntity.malloc [DL::TYPE_INT, DL::TYPE_LONG] - union.assign_names %w[int long] + def test_set_ctypes + union = CUnionEntity.malloc [TYPE_INT, TYPE_LONG] + union.assign_names %w[int long] - # this test is roundabout because the stored ctypes are not accessible - union['long'] = 1 - assert_equal 1, union['long'] + # this test is roundabout because the stored ctypes are not accessible + union['long'] = 1 + assert_equal 1, union['long'] - union['int'] = 1 - assert_equal 1, union['int'] + union['int'] = 1 + assert_equal 1, union['int'] + end end end - diff --git a/test/dl/test_cparser.rb b/test/dl/test_cparser.rb index cea9ac73b0..a4deb6733e 100644 --- a/test/dl/test_cparser.rb +++ b/test/dl/test_cparser.rb @@ -4,30 +4,30 @@ require 'dl/cparser' module DL class TestCParser < TestBase - include DL::CParser + include CParser def test_uint_ctype - assert_equal(-DL::TYPE_INT, parse_ctype('uint')) + assert_equal(-TYPE_INT, parse_ctype('uint')) end def test_size_t_ctype - assert_equal(DL::TYPE_SIZE_T, parse_ctype("size_t")) + assert_equal(TYPE_SIZE_T, parse_ctype("size_t")) end def test_ssize_t_ctype - assert_equal(DL::TYPE_SSIZE_T, parse_ctype("ssize_t")) + assert_equal(TYPE_SSIZE_T, parse_ctype("ssize_t")) end def test_ptrdiff_t_ctype - assert_equal(DL::TYPE_PTRDIFF_T, parse_ctype("ptrdiff_t")) + assert_equal(TYPE_PTRDIFF_T, parse_ctype("ptrdiff_t")) end def test_intptr_t_ctype - assert_equal(DL::TYPE_INTPTR_T, parse_ctype("intptr_t")) + assert_equal(TYPE_INTPTR_T, parse_ctype("intptr_t")) end def test_uintptr_t_ctype - assert_equal(DL::TYPE_UINTPTR_T, parse_ctype("uintptr_t")) + assert_equal(TYPE_UINTPTR_T, parse_ctype("uintptr_t")) end end end diff --git a/test/dl/test_import.rb b/test/dl/test_import.rb index 41def7c913..8b3f39b851 100644 --- a/test/dl/test_import.rb +++ b/test/dl/test_import.rb @@ -35,7 +35,7 @@ module DL ] CallCallback = bind("void call_callback(void*, void*)"){|ptr1, ptr2| - f = Function.new(CFunc.new(ptr1.to_i, DL::TYPE_VOID, ""), [TYPE_VOIDP]) + f = Function.new(CFunc.new(ptr1.to_i, TYPE_VOID, ""), [TYPE_VOIDP]) f.call(ptr2) } CarriedFunction = bind("void callback_function(void*)", :carried, 0) @@ -45,7 +45,7 @@ module DL def test_ensure_call_dlload err = assert_raises(RuntimeError) do Class.new do - extend DL::Importer + extend Importer extern "void *strcpy(char*, char*)" end end @@ -59,7 +59,7 @@ module DL end def test_sizeof() - assert_equal(DL::SIZEOF_VOIDP, LIBC.sizeof("FILE*")) + assert_equal(SIZEOF_VOIDP, LIBC.sizeof("FILE*")) assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct)) end @@ -71,7 +71,7 @@ module DL end def test_io() - if( RUBY_PLATFORM != DL::BUILD_RUBY_PLATFORM ) + if( RUBY_PLATFORM != BUILD_RUBY_PLATFORM ) return end io_in,io_out = IO.pipe() -- cgit v1.2.3