From c5de4d4cbd28c1763259f814c4cc29ea01e6af59 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 4 Jul 2010 13:03:04 +0000
Subject: [PATCH] * test/ruby/test_system.rb (test_syntax): unified with
 test_syntax2.

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

diff --git a/ChangeLog b/ChangeLog
index 976da0b6c7..73edc61f2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jul  4 22:02:02 2010  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_system.rb (test_syntax): unified with test_syntax2.
+
 Sun Jul  4 21:00:39 2010  Tanaka Akira  <akr@fsij.org>
 
 	* test/ruby/test_system.rb (test_syntax2): moved from sample/test.rb
diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb
index 7a6d35477a..24b6a0d235 100644
--- a/test/ruby/test_system.rb
+++ b/test/ruby/test_system.rb
@@ -14,19 +14,6 @@ class TestSystem < Test::Unit::TestCase
     false
   end
 
-  def valid_syntax2?(code, fname)
-    p fname
-    code = code.dup.force_encoding("ascii-8bit")
-    code.sub!(/\A(?:\xef\xbb\xbf)?(\s*\#.*$)*(\n)?/n) {
-      "#$&#{"\n" if $1 && !$2}BEGIN{throw tag, :ok}\n"
-    }
-    code.force_encoding("us-ascii")
-    catch {|tag| eval(code, binding, fname, 0)}
-  rescue Exception
-    STDERR.puts $!.message
-    false
-  end
-
   def test_system
     ruby = EnvUtil.rubybin
     assert_equal("foobar\n", `echo foobar`)
@@ -114,22 +101,8 @@ class TestSystem < Test::Unit::TestCase
 
   def test_syntax
     assert_nothing_raised(Exception) do
-      for script in Dir[File.expand_path("../../../{lib,sample,ext}/**/*.rb", __FILE__)]
-        valid_syntax? IO::read(script), script
-      end
-    end
-  end
-
-  def test_syntax2
-    if (dir = File.dirname(File.dirname(File.dirname(__FILE__)))) == '.'
-      dir = ""
-    else
-      dir << "/"
-    end
-    for script in Dir["#{dir}{lib,sample,ext,test}/**/*.rb"].sort
-      unless valid_syntax2? IO::read(script), script
-	STDERR.puts script
-        flunk("syntax error: #{script}")
+      for script in Dir[File.expand_path("../../../{lib,sample,ext,test}/**/*.rb", __FILE__)].sort
+        assert(valid_syntax?(IO::read(script), script))
       end
     end
   end