From d83e21d15ddd9142c448aea80dbca6c452ecff6a Mon Sep 17 00:00:00 2001
From: nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 23 Dec 2003 07:13:59 +0000
Subject:         * lib/rexml/encodings/US-ASCII.rb: typo.  [ruby-talk:88650]

        * test/ruby/test_system.rb: num of asserts depended on running dir.

        * test/xsd/test_noencoding.rb: rexml + without iconv/uconv cannot
          handle euc-jp.  install iconv, uconv or xmlscan.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_system.rb    | 4 ++--
 test/xsd/test_noencoding.rb | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb
index d756e4a2d5..71eb7ad183 100644
--- a/test/ruby/test_system.rb
+++ b/test/ruby/test_system.rb
@@ -61,8 +61,8 @@ class TestSystem < Test::Unit::TestCase
       dir << "/"
     end
 
-    for script in Dir["#{dir}{lib,sample,ext}/**/*.rb"]
-      assert_nothing_raised(Exception) do
+    assert_nothing_raised(Exception) do
+      for script in Dir["#{dir}{lib,sample,ext}/**/*.rb"]
         valid_syntax? IO::read(script), script
       end
     end
diff --git a/test/xsd/test_noencoding.rb b/test/xsd/test_noencoding.rb
index f4a2232faa..48119ec1f7 100644
--- a/test/xsd/test_noencoding.rb
+++ b/test/xsd/test_noencoding.rb
@@ -13,6 +13,12 @@ class TestEmptyCharset < Test::Unit::TestCase
   def test_wsdl
     begin
       xml = WSDL::XMLSchema::Parser.new.parse(File.open(@file) { |f| f.read })
+    rescue RuntimeError
+      if XSD::XMLParser.const_defined?("REXMLParser")
+	STDERR.puts("rexml cannot handle euc-jp without iconv/uconv.")
+	return
+      end
+      raise
     rescue Errno::EINVAL
       # unsupported encoding
       return
-- 
cgit v1.2.3