yugui	2011-03-28 22:40:46 +0900 (Mon, 28 Mar 2011)

  New Revision: 31199

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

  Log:
    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.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/dl/test_dl2.rb
    branches/ruby_1_9_2/test/dl/test_func.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31198)
+++ ruby_1_9_2/ChangeLog	(revision 31199)
@@ -1,3 +1,10 @@
+Sun Jan 30 16:15:20 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* enc/emacs_mule.c (emacsmule_islead): 7bit range is also leading
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31198)
+++ ruby_1_9_2/version.h	(revision 31199)
@@ -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
Index: ruby_1_9_2/test/dl/test_dl2.rb
===================================================================
--- ruby_1_9_2/test/dl/test_dl2.rb	(revision 31198)
+++ ruby_1_9_2/test/dl/test_dl2.rb	(revision 31199)
@@ -95,6 +95,7 @@
   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])
Index: ruby_1_9_2/test/dl/test_func.rb
===================================================================
--- ruby_1_9_2/test/dl/test_func.rb	(revision 31198)
+++ ruby_1_9_2/test/dl/test_func.rb	(revision 31199)
@@ -22,6 +22,7 @@
     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 @@
     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

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