naruse	2011-07-24 01:15:12 +0900 (Sun, 24 Jul 2011)

  New Revision: 32653

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32653

  Log:
    merge revision(s) 32642:
    
    * 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.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/rake/test_rake_functional.rb
    branches/ruby_1_9_3/test/rake/test_rake_rake_test_loader.rb
    branches/ruby_1_9_3/test/rake/test_rake_task_argument_parsing.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32652)
+++ ruby_1_9_3/ChangeLog	(revision 32653)
@@ -1,3 +1,15 @@
+Sun Jul 24 01:14:49 2011  NARUSE, Yui  <naruse@r...>
+
+	* 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@m...>
 
 	* configure.in: change the default compiler to gcc-4.2 if target os
Index: ruby_1_9_3/test/rake/test_rake_functional.rb
===================================================================
--- ruby_1_9_3/test/rake/test_rake_functional.rb	(revision 32652)
+++ ruby_1_9_3/test/rake/test_rake_functional.rb	(revision 32653)
@@ -5,8 +5,8 @@
 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']
 
Index: ruby_1_9_3/test/rake/test_rake_task_argument_parsing.rb
===================================================================
--- ruby_1_9_3/test/rake/test_rake_task_argument_parsing.rb	(revision 32652)
+++ ruby_1_9_3/test/rake/test_rake_task_argument_parsing.rb	(revision 32653)
@@ -67,7 +67,7 @@
   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
Index: ruby_1_9_3/test/rake/test_rake_rake_test_loader.rb
===================================================================
--- ruby_1_9_3/test/rake/test_rake_rake_test_loader.rb	(revision 32652)
+++ ruby_1_9_3/test/rake/test_rake_rake_test_loader.rb	(revision 32653)
@@ -10,7 +10,7 @@
 
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/