From fb8f66cf2339fa4fd99bccc72adb39eab6ba2700 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 21 Jul 2014 06:29:53 +0000 Subject: test/rake: fix tests under test-all * test/rake/test_rake_application.rb (test_display_exception_details): `RbConfig::CONFIG["prefix"]` can be the root directory, under test-all. * test/rake/test_rake_test_task.rb (test_run_code_rake_default_gem): `-I` may be inserted, under test-all. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rake/test_rake_application.rb | 4 +++- test/rake/test_rake_test_task.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'test/rake') diff --git a/test/rake/test_rake_application.rb b/test/rake/test_rake_application.rb index 1532be1c9b..f52040471b 100644 --- a/test/rake/test_rake_application.rb +++ b/test/rake/test_rake_application.rb @@ -17,8 +17,10 @@ class TestRakeApplication < Rake::TestCase end def test_display_exception_details + obj = Object.new + obj.instance_eval("def #{__method__}; raise 'test'; end", "ruby") begin - raise 'test' + obj.__send__(__method__) rescue => ex end diff --git a/test/rake/test_rake_test_task.rb b/test/rake/test_rake_test_task.rb index 9b500dc044..80fe9a28b4 100644 --- a/test/rake/test_rake_test_task.rb +++ b/test/rake/test_rake_test_task.rb @@ -105,7 +105,7 @@ class TestRakeTestTask < Rake::TestCase t.loader = :rake end - assert_match(/\A ".*?"\Z/, test_task.run_code) + assert_match(/\A(-I".*?" *)* ".*?"\Z/, test_task.run_code) ensure Gem.loaded_specs['rake'] = rake end -- cgit v1.2.3