From 36eb3366780a42736905a66c44fb3f21484591a8 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 15 Apr 2013 16:27:33 +0000 Subject: revert r40311(merge revision(s) 40117,40118). It breaks rubyci tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ----- ext/curses/curses.c | 2 +- test/test_curses.rb | 48 ------------------------------------------------ version.h | 2 +- 4 files changed, 2 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00d0a6c129..89cb83e5e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,11 +3,6 @@ Tue Apr 16 00:27:56 2013 Nobuyoshi Nakada * compile.c (iseq_compile_each): fix of defined? with empty expression. [ruby-core:53999] [Bug #8220] -Mon Apr 15 23:19:35 2013 Nobuyoshi Nakada - - * ext/curses/curses.c (Init_curses): fix implementation function, - crmode should be same as cbreak. [ruby-core:54013] [Bug #8222] - Mon Apr 15 00:25:00 2013 Tanaka Akira * time.c (num_exact): use to_r method only if to_int method is diff --git a/ext/curses/curses.c b/ext/curses/curses.c index 88b1bdb3aa..175e32cff9 100644 --- a/ext/curses/curses.c +++ b/ext/curses/curses.c @@ -2715,7 +2715,7 @@ Init_curses(void) rb_define_module_function(mCurses, "noraw", curses_noraw, 0); rb_define_module_function(mCurses, "cbreak", curses_cbreak, 0); rb_define_module_function(mCurses, "nocbreak", curses_nocbreak, 0); - rb_define_module_function(mCurses, "crmode", curses_cbreak, 0); + rb_define_module_function(mCurses, "crmode", curses_nocbreak, 0); rb_define_module_function(mCurses, "nocrmode", curses_nocbreak, 0); rb_define_module_function(mCurses, "nl", curses_nl, 0); rb_define_module_function(mCurses, "nonl", curses_nonl, 0); diff --git a/test/test_curses.rb b/test/test_curses.rb index 9432c024bb..03462d6f7e 100644 --- a/test/test_curses.rb +++ b/test/test_curses.rb @@ -1,9 +1,7 @@ require 'test/unit' -require_relative 'ruby/envutil' begin require 'curses' - require 'pty' rescue LoadError end @@ -12,49 +10,3 @@ class TestCurses < Test::Unit::TestCase assert_instance_of(String, Curses::VERSION) end end if defined? Curses - -class TestCurses - def run_curses(src, input = nil, timeout: 1) - PTY.spawn(EnvUtil.rubybin, "-e", <<-"src") {|r, w, pid| -require 'timeout' -require 'curses' -include Curses -init_screen -begin - result = Timeout.timeout(#{timeout}) do - #{src} - end -rescue Exception => e -ensure - close_screen - puts "", [Marshal.dump([result, e])].pack('m').delete("\n") -end -src - if input - w.print(input) - w.flush - end - res = r.read - return unless res - res, error = Marshal.load(res[/(.*)\Z/, 1].unpack('m')[0]) - raise error if error - return res - } - end - - def test_getch - assert_equal("a", run_curses("getch", "a")) - end - def test_getch_cbreak - assert_equal("a", run_curses("cbreak; getch", "a")) - end - def test_getch_nocbreak - assert_raise(Timeout::Error) {run_curses("nocbreak; getch", "a")} - end - def test_getch_crmode - assert_equal("a", run_curses("crmode; getch", "a")) - end - def test_getch_nocrmode - assert_raise(Timeout::Error) {run_curses("nocrmode; getch", "a")} - end -end if defined? TestCurses and defined? PTY diff --git a/version.h b/version.h index 1a2ce4eec0..ba212e387d 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-04-16" -#define RUBY_PATCHLEVEL 138 +#define RUBY_PATCHLEVEL 139 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4 -- cgit v1.2.3