summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-23 11:21:55 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-23 11:21:55 +0000
commitfe4ceb25b907b5cc5af46cc0d32ca67b10d7d7d5 (patch)
tree5873c9bbf77d4dc4837e0a0a91c3246431ee0ab3 /test
parentf99bed93302a0485b615dd651915d1262c1d1bcb (diff)
* 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/trunk@32642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/rake/test_rake_functional.rb4
-rw-r--r--test/rake/test_rake_rake_test_loader.rb2
-rw-r--r--test/rake/test_rake_task_argument_parsing.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/test/rake/test_rake_functional.rb b/test/rake/test_rake_functional.rb
index 9b3afedc44..bfa9375a39 100644
--- a/test/rake/test_rake_functional.rb
+++ b/test/rake/test_rake_functional.rb
@@ -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']
diff --git a/test/rake/test_rake_rake_test_loader.rb b/test/rake/test_rake_rake_test_loader.rb
index 5b5e81d06d..be3c7da61f 100644
--- a/test/rake/test_rake_rake_test_loader.rb
+++ b/test/rake/test_rake_rake_test_loader.rb
@@ -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
diff --git a/test/rake/test_rake_task_argument_parsing.rb b/test/rake/test_rake_task_argument_parsing.rb
index 8ef9d7236b..9b99991de9 100644
--- a/test/rake/test_rake_task_argument_parsing.rb
+++ b/test/rake/test_rake_task_argument_parsing.rb
@@ -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