archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 10:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 32642:

Browse source 
* test/rake/test_rake_functional.rb (setup): Use __FILE__ for the base
	  directory. Current directory is not the top source directory when
	  the building process runs on other than there.

	* test/rake/test_rake_rake_test_loader.rb: ditto.

	* test/rake/test_rake_task_argument_parsing.rb
	  (test_terminal_width_using_hardcoded_80): hardcoded 80 is used
	  when app.unix? is false.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-07-23 16:15:12 +00:00
parent e1d542bc8b
commit 301dfa19b0
4 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Sun Jul 24 01:14:49 2011 NARUSE, Yui <naruse@ruby-lang.org>
* test/rake/test_rake_functional.rb (setup): Use __FILE__ for the base
directory. Current directory is not the top source directory when
the building process runs on other than there.
* test/rake/test_rake_rake_test_loader.rb: ditto.
* test/rake/test_rake_task_argument_parsing.rb
(test_terminal_width_using_hardcoded_80): hardcoded 80 is used
when app.unix? is false.
Sun Jul 24 00:42:00 2011 Kenta Murata <mrkn@mrkn.jp>
* configure.in: change the default compiler to gcc-4.2 if target os

4
test/rake/test_rake_functional.rb
View file

@ -5,8 +5,8 @@ require 'open3'
class TestRakeFunctional < Rake::TestCase
def setup
@rake_path = File.expand_path("bin/rake")
lib_path = File.expand_path("lib")
@rake_path = File.expand_path("../../../bin/rake", __FILE__)
lib_path = File.expand_path("../../../lib", __FILE__)
@ruby_options = ["-I#{lib_path}", "-I."]
@verbose = ENV['VERBOSE']

2
test/rake/test_rake_rake_test_loader.rb
View file

@ -10,7 +10,7 @@ class TestRakeRakeTestLoader < Rake::TestCase
ARGV.replace %w[foo.rb test_*.rb -v]
load File.join(@orig_PWD, 'lib/rake/rake_test_loader.rb')
load File.expand_path('../../../lib/rake/rake_test_loader.rb', __FILE__)
assert_equal %w[-v], ARGV
ensure

2
test/rake/test_rake_task_argument_parsing.rb
View file

@ -67,7 +67,7 @@ class TestRakeTaskArgumentParsing < Rake::TestCase
end
def test_terminal_width_using_hardcoded_80
def @app.unix?() true end
def @app.unix?() false end
assert_equal 80, @app.terminal_width
end