diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-25 14:06:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-25 14:06:31 +0000 |
| commit | e6c5b9f30840ae985c4bdcb91435e9c2c06fb7ef (patch) | |
| tree | c13b0ab1c74db848c100581d765fd52073f7be03 /bootstraptest | |
| parent | c6629c48e61f341aa5e0b4b8f0c4816a2e9e0cc1 (diff) | |
revert r37326 "remove string literal concatenation"
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37328 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bootstraptest')
| -rwxr-xr-x | bootstraptest/runner.rb | 3 | ||||
| -rw-r--r-- | bootstraptest/test_syntax.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb index 60c9d26d95..0dd1e35a88 100755 --- a/bootstraptest/runner.rb +++ b/bootstraptest/runner.rb @@ -1,5 +1,4 @@ -#!/bin/sh -exec "${RUBY-ruby}" -x "$0" "$@" # -*- mode: ruby; coding: utf-8 -*- +"exec" "${RUBY-ruby}" "-x" "$0" "$@" || true # -*- mode: ruby; coding: utf-8 -*- #!./ruby # $Id$ diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb index 4d56908ac1..80eaa6416d 100644 --- a/bootstraptest/test_syntax.rb +++ b/bootstraptest/test_syntax.rb @@ -525,7 +525,7 @@ assert_equal %q{1}, %q{ } def assert_syntax_error expected, code, message = '' assert_equal "#{expected}", - "begin eval(%q{#{code}}, nil, '', 0); rescue SyntaxError => e; e.message[/\\A:(?:\\d+:)? (.*)/, 1] end", message + "begin eval(%q{#{code}}, nil, '', 0)"'; rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end', message end assert_syntax_error "unterminated string meets end of file", '().."', '[ruby-dev:29732]' assert_equal %q{[]}, %q{$&;[]}, '[ruby-dev:31068]' |