summaryrefslogtreecommitdiff
path: root/test/ruby
diff options
context:
space:
mode:
Diffstat (limited to 'test/ruby')
-rw-r--r--test/ruby/endblockwarn.rb14
-rw-r--r--test/ruby/test_beginendblock.rb2
2 files changed, 1 insertions, 15 deletions
diff --git a/test/ruby/endblockwarn.rb b/test/ruby/endblockwarn.rb
index 8da5c241ee..7b7f97f597 100644
--- a/test/ruby/endblockwarn.rb
+++ b/test/ruby/endblockwarn.rb
@@ -1,17 +1,3 @@
-BEGIN {
- if errout = ARGV.shift
- dir = File.dirname(File.expand_path(__FILE__))
- basename = File.basename(__FILE__)
- require "#{dir}/envutil"
- STDERR.reopen(File.open(errout, "w"))
- STDERR.sync = true
- Dir.chdir(dir)
- cmd = "\"#{EnvUtil.rubybin}\" \"#{basename}\""
- exec(cmd)
- exit!("must not reach here")
- end
-}
-
def end1
END {}
end
diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb
index 202a8080ae..c7296a4e85 100644
--- a/test/ruby/test_beginendblock.rb
+++ b/test/ruby/test_beginendblock.rb
@@ -48,7 +48,7 @@ EOF
erroutpath = errout.path
system("#{q(ruby)} #{q(launcherpath)} #{q(erroutpath)}")
expected = <<EOW
-endblockwarn.rb:16: warning: END in method; use at_exit
+endblockwarn.rb:2: warning: END in method; use at_exit
(eval):2: warning: END in method; use at_exit
EOW
assert_equal(expected, File.read(erroutpath))