[前][次][番号順一覧][スレッド一覧]

ruby-changes:22604

From: naruse <ko1@a...>
Date: Fri, 17 Feb 2012 10:15:09 +0900 (JST)
Subject: [ruby-changes:22604] naruse:r34653 (ruby_1_9_3): merge revision(s) 34646:

naruse	2012-02-17 10:14:57 +0900 (Fri, 17 Feb 2012)

  New Revision: 34653

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

  Log:
    merge revision(s) 34646:
    
    * test/dbm/test_dbm.rb: fix skip condition for libgdbm 1.8.0 or prior.
      reported by Bohuslav Kabrda.
      [ruby-core:42685] [ruby-trunk - Bug #6036]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/dbm/test_dbm.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34652)
+++ ruby_1_9_3/ChangeLog	(revision 34653)
@@ -1,3 +1,9 @@
+Fri Feb 17 10:14:47 2012  Tanaka Akira  <akr@f...>
+
+	* test/dbm/test_dbm.rb: fix skip condition for libgdbm 1.8.0 or prior.
+	  reported by Bohuslav Kabrda.
+	  [ruby-core:42685] [ruby-trunk - Bug #6036]
+
 Fri Feb 17 09:53:46 2012  NARUSE, Yui  <naruse@r...>
 
 	* tool/transcode-tblgen.rb (import_ucm): don't use \h because the
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34652)
+++ ruby_1_9_3/version.h	(revision 34653)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 127
+#define RUBY_PATCHLEVEL 128
 
 #define RUBY_RELEASE_DATE "2012-02-17"
 #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 34652)
+++ ruby_1_9_3/test/dbm/test_dbm.rb	(revision 34653)
@@ -105,7 +105,7 @@
     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
+      skip "dbm_open() is broken on libgdbm 1.8.0 or prior (#{DBM::VERSION})" if /GDBM version 1\.(?:[0-7]\b|8\.0)/ =~ DBM::VERSION
       assert_nil(dbm = DBM.open("#{@tmpdir}/#{@prefix}", nil))
     ensure
       dbm.close if dbm
@@ -529,7 +529,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
+      skip "dbm_open() is broken on libgdbm 1.8.0 or prior (#{DBM::VERSION})" if /GDBM version 1\.(?:[0-7]\b|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/

[前][次][番号順一覧][スレッド一覧]