summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-01 11:56:06 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-01 11:56:06 +0000
commitaf3e36158fd820634cfed1ad318c87152690d086 (patch)
treebf5ef504886b8428e34363ed818917f530ebf5ce
parentb8bc68113ac3a8c6b66bf5a11a7a75691851f455 (diff)
* test/ruby/test_system.rb (TestSystem#test_system_at):
remove tests for [bug#4396]. because we decided to reject this ticket. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_system.rb17
2 files changed, 7 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 8adaa2ad98..12796215a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 1 20:51:57 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * test/ruby/test_system.rb (TestSystem#test_system_at):
+ remove tests for [bug#4396]. because we decided to reject this
+ ticket.
+
Tue Mar 1 19:46:19 2011 Tadayoshi Funaba <tadf@dotrb.org>
* test/date/{test_date.rb,test_date_attr.rb}: [ruby-dev:43280]
diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb
index 34eb45f4c1..f1372781cf 100644
--- a/test/ruby/test_system.rb
+++ b/test/ruby/test_system.rb
@@ -91,23 +91,13 @@ class TestSystem < Test::Unit::TestCase
def test_system_at
if /mswin|mingw/ =~ RUBY_PLATFORM
bug4393 = '[ruby-core:35218]'
- bug4396 = '[ruby-core:35227]'
# @ + builtin command
assert_equal("foo\n", `@echo foo`, bug4393);
assert_equal("foo\n", `@@echo foo`, bug4393);
assert_equal("@@foo\n", `@@echo @@foo`, bug4393);
- # "" + @ + built-in
- assert_equal("@@foo\n", `"echo" @@foo`, bug4396);
- assert_equal("@@foo\n", `"@@echo" @@foo`, bug4396);
- assert_equal("@@foo\n", `"@@echo @@foo"`, bug4396);
-
- # ^ + @ + built-in
- assert_equal(false, system('^@echo foo'), bug4396);
- assert_equal(false, system('"^@echo foo"'), bug4396);
- assert_equal("@foo\n", `echo ^@foo`);
-
+ # @ + non builtin command
Dir.mktmpdir("ruby_script_tmp") {|tmpdir|
tmpfilename = "#{tmpdir}/ruby_script_tmp.#{$$}"
@@ -115,12 +105,7 @@ class TestSystem < Test::Unit::TestCase
tmp.print "foo\nbar\nbaz\n@foo";
tmp.close
- # @ + non builtin command
assert_match(/\Abar\nbaz\n?\z/, `@@findstr "ba" #{tmpfilename.gsub("/", "\\")}`, bug4393);
-
- # "" + @ + non built-in
- assert_match(/\Abar\nbaz\n?\z/, `"@@findstr ba" #{tmpfilename.gsub("/", "\\")}`, bug4396);
- assert_match(/\A@foo\n?\z/, `"@@findstr @foo" #{tmpfilename.gsub("/", "\\")}`, bug4396);
}
end
end