From 0b13e6ffb6e46ede3704ee7fe949f2164ab11c05 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 31 Oct 2009 13:05:11 +0000 Subject: merges r24828 from trunk into ruby_1_9_1. -- * test/dl/test_cptr.rb (test_free=): test SEGV at first. [ruby-dev:39269] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/dl/test_cptr.rb | 15 +++++++++++++++ version.h | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0f5a3e3dd..9db193d9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 10 21:22:01 2009 Tanaka Akira + + * test/dl/test_cptr.rb (test_free=): test SEGV at first. + [ruby-dev:39269] + Tue Mar 3 15:05:19 2009 Nobuyoshi Nakada * ext/dl/lib/dl/value.rb (DL::ValueUtil#wrap_arg): NULL for nil. diff --git a/test/dl/test_cptr.rb b/test/dl/test_cptr.rb index 2d6a08e1c..c0d080906 100644 --- a/test/dl/test_cptr.rb +++ b/test/dl/test_cptr.rb @@ -1,4 +1,5 @@ require_relative 'test_base' +require_relative '../ruby/envutil' module DL class TestCPtr < TestBase @@ -8,6 +9,20 @@ module DL end def test_free= + assert_normal_exit(<<-"End", '[ruby-dev:39269]') + require 'dl + DL::LIBC_SO = #{LIBC_SO.dump} + DL::LIBM_SO = #{LIBM_SO.dump} + include DL + @libc = dlopen(LIBC_SO) + @libm = dlopen(LIBM_SO) + free = CFunc.new(@libc['free'], TYPE_VOID, 'free') + ptr = CPtr.malloc(4) + ptr.free = free + free.ptr + ptr.free.ptr + End + free = CFunc.new(@libc['free'], TYPE_VOID, 'free') ptr = CPtr.malloc(4) ptr.free = free diff --git a/version.h b/version.h index d6a056513..60aa873c1 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 319 +#define RUBY_PATCHLEVEL 320 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit