updates to support ruby 1.9.2 preview

taf2 · Jul 23, 2009 · 061a0c0 · 061a0c0
1 parent d57a4e6
commit 061a0c0
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/tests/bug_curb_easy_blocks_ruby_threads.rb b/tests/bug_curb_easy_blocks_ruby_threads.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 require 'webrick'
 class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
 class ::WEBrick::BasicLog ; def log(level, data) ; end ; end

diff --git a/tests/bug_instance_post_differs_from_class_post.rb b/tests/bug_instance_post_differs_from_class_post.rb
@@ -23,7 +23,7 @@
 #   instance httppost. This bug is intermittent, but results in an
 #   exception from the first post when it occurs.
 #   
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
   def test_bug

diff --git a/tests/bug_multi_segfault.rb b/tests/bug_multi_segfault.rb
@@ -3,8 +3,8 @@
 # irb: multi = Curl::Multi.new
 # irb: exit
 # <main>:47140: [BUG] Bus Error
-$:.unshift File.join(File.dirname(__FILE__),'..','ext')
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','ext'))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 require 'curb'
 multi = Curl::Multi.new
 exit
diff --git a/tests/require_last_or_segfault_script.rb b/tests/require_last_or_segfault_script.rb
@@ -21,8 +21,8 @@
 #  Aborted
 #  ------------------------------------------------------------------
 #
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'ext'))
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'ext')))
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 require 'curb'
 require 'uri'
 

diff --git a/tests/tc_curl_download.rb b/tests/tc_curl_download.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class TestCurbCurlDownload < Test::Unit::TestCase
   include TestServerMethods 

diff --git a/tests/tc_curl_easy.rb b/tests/tc_curl_easy.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class TestCurbCurlEasy < Test::Unit::TestCase
   def test_class_perform_01   

diff --git a/tests/tc_curl_multi.rb b/tests/tc_curl_multi.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class TestCurbCurlMulti < Test::Unit::TestCase
   def teardown

diff --git a/tests/tc_curl_postfield.rb b/tests/tc_curl_postfield.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helper')
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class TestCurbCurlPostfield < Test::Unit::TestCase
   def test_private_new