[前][次][番号順一覧][スレッド一覧]

ruby-changes:33292

From: nagachika <ko1@a...>
Date: Thu, 20 Mar 2014 20:45:39 +0900 (JST)
Subject: [ruby-changes:33292] nagachika:r45371 (ruby_2_0_0): merge revision(s) r40930:

nagachika	2014-03-20 20:45:22 +0900 (Thu, 20 Mar 2014)

  New Revision: 45371

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45371

  Log:
    merge revision(s) r40930:
    
    * 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.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/fiddle/test_c_struct_entry.rb
    branches/ruby_2_0_0/test/fiddle/test_c_union_entity.rb
    branches/ruby_2_0_0/test/fiddle/test_cparser.rb
    branches/ruby_2_0_0/test/fiddle/test_func.rb
    branches/ruby_2_0_0/test/fiddle/test_handle.rb
    branches/ruby_2_0_0/test/fiddle/test_import.rb
    branches/ruby_2_0_0/test/fiddle/test_pointer.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 45370)
+++ ruby_2_0_0/ChangeLog	(revision 45371)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Mar 20 20:44:17 2014  Kazuki Tsujimoto  <kazuki@c...>
+
+	* 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.
+
 Sun Mar 16 00:57:20 2014  Kazuki Tsujimoto  <kazuki@c...>
 
 	* ext/.document: remove refinement from documentable directories.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 45370)
+++ ruby_2_0_0/version.h	(revision 45371)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-03-16"
-#define RUBY_PATCHLEVEL 458
+#define RUBY_RELEASE_DATE "2014-03-20"
+#define RUBY_PATCHLEVEL 459
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 20
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/fiddle/test_cparser.rb
===================================================================
--- ruby_2_0_0/test/fiddle/test_cparser.rb	(revision 45370)
+++ ruby_2_0_0/test/fiddle/test_cparser.rb	(revision 45371)
@@ -1,6 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_cparser.rb#L1
-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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_cparser.rb#L32
       assert_equal(TYPE_UINTPTR_T, parse_ctype("uintptr_t"))
     end
   end
-end
+end if defined?(Fiddle)
Index: ruby_2_0_0/test/fiddle/test_pointer.rb
===================================================================
--- ruby_2_0_0/test/fiddle/test_pointer.rb	(revision 45370)
+++ ruby_2_0_0/test/fiddle/test_pointer.rb	(revision 45371)
@@ -1,5 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_pointer.rb#L1
-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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_pointer.rb#L231
       assert_raise(DLError) {nullpo[0] = 1}
     end
   end
-end
+end if defined?(Fiddle)
Index: ruby_2_0_0/test/fiddle/test_c_union_entity.rb
===================================================================
--- ruby_2_0_0/test/fiddle/test_c_union_entity.rb	(revision 45370)
+++ ruby_2_0_0/test/fiddle/test_c_union_entity.rb	(revision 45371)
@@ -1,6 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_c_union_entity.rb#L1
-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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_c_union_entity.rb#L31
       assert_equal 1, union['int']
     end
   end
-end
+end if defined?(Fiddle)
Index: ruby_2_0_0/test/fiddle/test_c_struct_entry.rb
===================================================================
--- ruby_2_0_0/test/fiddle/test_c_struct_entry.rb	(revision 45370)
+++ ruby_2_0_0/test/fiddle/test_c_struct_entry.rb	(revision 45371)
@@ -1,6 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_c_struct_entry.rb#L1
-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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_c_struct_entry.rb#L73
       assert_equal("Alice", user["name"].to_s)
     end
   end
-end
+end if defined?(Fiddle)
Index: ruby_2_0_0/test/fiddle/test_import.rb
===================================================================
--- ruby_2_0_0/test/fiddle/test_import.rb	(revision 45370)
+++ ruby_2_0_0/test/fiddle/test_import.rb	(revision 45371)
@@ -1,6 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_import.rb#L1
 # 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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_import.rb#L137
       assert_includes(12.00..13.00, r)
     end
   end
-end
+end if defined?(Fiddle)
Index: ruby_2_0_0/test/fiddle/test_func.rb
===================================================================
--- ruby_2_0_0/test/fiddle/test_func.rb	(revision 45370)
+++ ruby_2_0_0/test/fiddle/test_func.rb	(revision 45371)
@@ -1,4 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_func.rb#L1
-require_relative 'helper'
+begin
+  require_relative 'helper'
+rescue LoadError
+end
 
 module Fiddle
   class TestFunc < TestCase
@@ -86,4 +89,4 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_func.rb#L89
       assert_equal("1349", buff, bug4929)
     end
   end
-end
+end if defined?(Fiddle)
Index: ruby_2_0_0/test/fiddle/test_handle.rb
===================================================================
--- ruby_2_0_0/test/fiddle/test_handle.rb	(revision 45370)
+++ ruby_2_0_0/test/fiddle/test_handle.rb	(revision 45371)
@@ -1,4 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_handle.rb#L1
-require_relative 'helper'
+begin
+  require_relative 'helper'
+rescue LoadError
+end
 
 module Fiddle
   class TestHandle < TestCase
@@ -183,4 +186,4 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_handle.rb#L186
       Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
     end if /freebsd/=~ RUBY_PLATFORM
   end
-end
+end if defined?(Fiddle)

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40930


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]