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

ruby-changes:21389

From: ktsj <ko1@a...>
Date: Sun, 9 Oct 2011 11:18:30 +0900 (JST)
Subject: [ruby-changes:21389] ktsj:r33438 (trunk): * test/psych/test_yamldbm.rb: don't run test if the system

ktsj	2011-10-09 11:18:18 +0900 (Sun, 09 Oct 2011)

  New Revision: 33438

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

  Log:
    * test/psych/test_yamldbm.rb: don't run test if the system
      don't support yaml/dbm.
    
    * test/syck/test_yamldbm.rb: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/test/psych/test_yamldbm.rb
    trunk/test/syck/test_yamldbm.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33437)
+++ ChangeLog	(revision 33438)
@@ -1,3 +1,10 @@
+Sun Oct  9 11:06:52 2011  Kazuki Tsujimoto  <kazuki@c...>
+
+	* test/psych/test_yamldbm.rb: don't run test if the system
+	  don't support yaml/dbm.
+
+	* test/syck/test_yamldbm.rb: ditto.
+
 Sat Oct  8 08:54:56 2011  Eric Hodel  <drbrain@s...>
 
 	* enum.c (group_by):  Improve group_by description.  Patch by b t.
Index: test/psych/test_yamldbm.rb
===================================================================
--- test/psych/test_yamldbm.rb	(revision 33437)
+++ test/psych/test_yamldbm.rb	(revision 33438)
@@ -1,10 +1,14 @@
 # -*- coding: UTF-8 -*-
-require 'test/unit'
-require 'yaml/dbm'
-require 'tmpdir'
-Psych::DBM = YAML::DBM unless defined?(Psych::DBM)
+begin
+  require 'test/unit'
+  require 'yaml/dbm'
+  require 'tmpdir'
+rescue LoadError
+end
 
 module Psych
+  ::Psych::DBM = ::YAML::DBM unless defined?(::Psych::DBM)
+
   class YAMLDBMTest < Test::Unit::TestCase
     def setup
       @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
@@ -187,4 +191,4 @@
       assert_equal([], @yamldbm.select {false})
     end
   end
-end
+end if defined?(YAML::DBM)
Index: test/syck/test_yamldbm.rb
===================================================================
--- test/syck/test_yamldbm.rb	(revision 33437)
+++ test/syck/test_yamldbm.rb	(revision 33438)
@@ -1,10 +1,14 @@
 # -*- coding: UTF-8 -*-
-require 'test/unit'
-require 'yaml/dbm'
-require 'tmpdir'
-Syck::DBM = YAML::DBM unless defined?(Syck::DBM)
+begin
+  require 'test/unit'
+  require 'yaml/dbm'
+  require 'tmpdir'
+rescue LoadError
+end
 
 module Syck
+  ::Syck::DBM = ::YAML::DBM unless defined?(::Syck::DBM)
+
   class YAMLDBMTest < Test::Unit::TestCase
     def setup
       @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'syck'
@@ -187,4 +191,4 @@
       assert_equal([], @yamldbm.select {false})
     end
   end
-end
+end if defined?(YAML::DBM)

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

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