ruby-changes:22393
From: naruse <ko1@a...>
Date: Mon, 6 Feb 2012 21:12:06 +0900 (JST)
Subject: [ruby-changes:22393] naruse:r34442 (ruby_1_9_3): merge revision(s) 33956,33960,33961,33962:
naruse 2012-02-06 21:11:55 +0900 (Mon, 06 Feb 2012) New Revision: 34442 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34442 Log: merge revision(s) 33956,33960,33961,33962: ------------------------------------------------------------------------ r33956 | naruse | 2011-12-06 06:47:16 +0900 (Tue, 06 Dec 2011) | 1 line Comment out tests which fails with GDBM-DBM compat mode. ------------------------------------------------------------------------ Modified files: branches/ruby_1_9_3/test/dbm/test_dbm.rb branches/ruby_1_9_3/version.h Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 34441) +++ ruby_1_9_3/version.h (revision 34442) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 39 +#define RUBY_PATCHLEVEL 40 #define RUBY_RELEASE_DATE "2012-02-06" #define RUBY_RELEASE_YEAR 2012 Index: ruby_1_9_3/test/dbm/test_dbm.rb =================================================================== --- ruby_1_9_3/test/dbm/test_dbm.rb (revision 34441) +++ ruby_1_9_3/test/dbm/test_dbm.rb (revision 34442) @@ -79,11 +79,14 @@ assert_equal(foo, true) assert_nil(dbm.close) end + def test_s_open_no_create + skip "dbm_open() is broken on libgdbm 1.8.0 or prior" if /GDBM version 1\.(?:[0-7]|8\.0)/ =~ DBM::VERSION assert_nil(dbm = DBM.open("#{@tmpdir}/#{@prefix}", nil)) ensure dbm.close if dbm end + def test_s_open_with_block assert_equal(DBM.open("#{@tmpdir}/#{@prefix}") { :foo }, :foo) end @@ -509,6 +512,7 @@ end def test_writer_open_notexist + skip "dbm_open() is broken on libgdbm 1.8.0 or prior" if /GDBM version 1\.(?:[0-7]|8\.0)/ =~ DBM::VERSION assert_raise(Errno::ENOENT) { DBM.open("#{@tmproot}/a", 0666, DBM::WRITER) } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/