Author: ko1
Date: 2006-02-14 01:52:40 +0900 (Tue, 14 Feb 2006)
New Revision: 406

Modified:
   trunk/
   trunk/ChangeLog
   trunk/error.c
   trunk/test.rb
   trunk/test/ruby/test_signal.rb
Log:
 r602@lermite:  ko1 | 2006-02-14 01:49:01 +0900
 	* error.c : fix include file positon
 
 	* test/ruby/test_signal.rb : skip test_exit_action on cygwin
 



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 81cd9672-7512-7e48-ae48-6936450e977d:/local/yarv/trunk:592
   + 81cd9672-7512-7e48-ae48-6936450e977d:/local/yarv/trunk:602

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-02-13 16:52:16 UTC (rev 405)
+++ trunk/ChangeLog	2006-02-13 16:52:40 UTC (rev 406)
@@ -4,6 +4,13 @@
 #  from Mon, 03 May 2004 01:24:19 +0900
 #
 
+2006-02-14(Tue) 01:42:11 +0900  Koichi Sasada  <ko1 atdot.net>
+
+	* error.c : fix include file positon
+
+	* test/ruby/test_signal.rb : skip test_exit_action on cygwin
+
+
 2006-02-14(Tue) 01:36:57 +0900  Minero Aoki  <aamine loveruby.net>
 
 	* test/ruby/test_class.rb: new file (imported from rubicon).

Modified: trunk/error.c
===================================================================
--- trunk/error.c	2006-02-13 16:52:16 UTC (rev 405)
+++ trunk/error.c	2006-02-13 16:52:40 UTC (rev 406)
@@ -12,6 +12,7 @@
 
 #include "ruby.h"
 #include "st.h"
+#include "yarv.h"
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -1468,8 +1469,6 @@
     eNOERROR = set_syserr(0, "NOERROR");
 }
 
-#include "yarv.h"
-
 static void
 err_append(const char *s)
 {

Modified: trunk/test/ruby/test_signal.rb
===================================================================
--- trunk/test/ruby/test_signal.rb	2006-02-13 16:52:16 UTC (rev 405)
+++ trunk/test/ruby/test_signal.rb	2006-02-13 16:52:40 UTC (rev 406)
@@ -34,6 +34,7 @@
 
   def test_exit_action
     return unless have_fork?	# snip this test
+    assert(false, "test_exit_action doesn't work on cygwin") if /cygwin/ =~ RUBY_PLATFORM
     begin
       r, w = IO.pipe
       r0, w0 = IO.pipe

Modified: trunk/test.rb
===================================================================
--- trunk/test.rb	2006-02-13 16:52:16 UTC (rev 405)
+++ trunk/test.rb	2006-02-13 16:52:40 UTC (rev 406)
@@ -1,3 +1,12 @@
+begin
+  eval ':$-('
+rescue Exception => e
+  puts '--------------------------------'
+  p e
+end
+p :exit
+__END__
+
 1.times{
   begin
     raise


-- 
ML: yarv-diff quickml.atdot.net
Info: http://www.atdot.net/~ko1/quickml