merges r30733 from trunk into ruby_1_9_2.

--
* test/dl/test_dl2.rb (TestDL#test_sin): math functions do not
  work on x86_64 due to the design of DL2.
* test/dl/test_func.rb (DL::TestFunc#test_{sinf,sin): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 451b880b44..858e53b25a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jan 30 16:15:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/dl/test_dl2.rb (TestDL#test_sin): math functions do not
+	  work on x86_64 due to the design of DL2.
+
+	* test/dl/test_func.rb (DL::TestFunc#test_{sinf,sin): ditto.
+
 Sun Jan 30 15:13:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enc/emacs_mule.c (emacsmule_islead): 7bit range is also leading
diff --git a/test/dl/test_dl2.rb b/test/dl/test_dl2.rb
index 431c5b2ae4..1d6e39114f 100644
--- a/test/dl/test_dl2.rb
+++ b/test/dl/test_dl2.rb
@@ -95,6 +95,7 @@ class TestDL < TestBase
   end
 
   def test_sin
+    return if /x86_64/ =~ RUBY_PLATFORM
     pi_2 = Math::PI/2
     cfunc = Function.new(CFunc.new(@libm['sin'], TYPE_DOUBLE, 'sin'),
                         [TYPE_DOUBLE])
diff --git a/test/dl/test_func.rb b/test/dl/test_func.rb
index d438f94506..27bf7daf7f 100644
--- a/test/dl/test_func.rb
+++ b/test/dl/test_func.rb
@@ -22,6 +22,7 @@ module DL
     end
 
     def test_sinf
+      return if /x86_64/ =~ RUBY_PLATFORM
       begin
         f = Function.new(CFunc.new(@libm['sinf'], TYPE_FLOAT, 'sinf'),
                          [TYPE_FLOAT])
@@ -32,6 +33,7 @@ module DL
     end
 
     def test_sin
+      return if /x86_64/ =~ RUBY_PLATFORM
       f = Function.new(CFunc.new(@libm['sin'], TYPE_DOUBLE, 'sin'),
                        [TYPE_DOUBLE])
       assert_in_delta 1.0, f.call(90 * Math::PI / 180), 0.0001
diff --git a/version.h b/version.h
index 41822a074b..ef94c7d258 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 182
+#define RUBY_PATCHLEVEL 183
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1