From 25a4c79279b3bbed2f99d5bfc14019c3f31d2807 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 15 Feb 2011 00:51:50 +0000 Subject: * test/ruby/test_system.rb (TestSystem#test_system_at): use findstr command instead of find command, because the latter is confusing another famous Unix command. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_system.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 444251661b..a91c72c337 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Feb 15 09:49:33 2011 NAKAMURA Usaku + + * test/ruby/test_system.rb (TestSystem#test_system_at): use findstr + command instead of find command, because the latter is confusing + another famous Unix command. + Mon Feb 14 23:01:19 2011 CHIKANAGA Tomoyuki * thread.c (rb_thread_io_blocking_region): reset th->waiting_fd diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb index faf63deba3..3d55eee725 100644 --- a/test/ruby/test_system.rb +++ b/test/ruby/test_system.rb @@ -103,7 +103,7 @@ class TestSystem < Test::Unit::TestCase tmp = open(tmpfilename, "w") tmp.print "foo\nbar\nbaz"; tmp.close - assert_match(/\n.*\nbar\nbaz\n/, `@@find "ba" #{tmpfilename.gsub("/", "\\")}`, testname); + assert_match(/\Abar\nbaz\n?\z/, `@@findstr "ba" #{tmpfilename.gsub("/", "\\")}`, testname); } end end -- cgit v1.2.3