jruby · Mar 3, 2016 · Mar 3, 2016 · Mar 3, 2016
Showing with 4 additions and 3 deletions.

+2 −2 core/src/main/java/org/jruby/ext/tempfile/Tempfile.java

+1 −0 test/externals/ruby1.8/logger/test_logger.rb

+1 −1 test/externals/ruby1.9/ruby/test_env.rb
diff --git a/core/src/main/java/org/jruby/ext/tempfile/Tempfile.java b/core/src/main/java/org/jruby/ext/tempfile/Tempfile.java
@@ -130,10 +130,10 @@ public IRubyObject call(ThreadContext context, IRubyObject[] args, Block block)
             }
 
             try {
-                File tmp = new File(tmpname.convertToString().toString());
+                path = tmpname.convertToString().toString();
+                File tmp = new File(path);
                 if (tmp.createNewFile()) {
                     tmpFile = tmp;
-                    path = tmp.getPath();
                     initializeOpen(ioOptions);
                 } else {
                     throw context.runtime.newErrnoEEXISTError(path);

diff --git a/test/externals/ruby1.8/logger/test_logger.rb b/test/externals/ruby1.8/logger/test_logger.rb
@@ -50,6 +50,7 @@ def log_raw(logger, msg_id, *arg, &block)
     logdev.open
     msg = logdev.read
     logdev.close
+    msg.gsub!(/\r\n/, "\n") # tempfile writes with crlf logic on...fix for tests
     msg
   end
 

diff --git a/test/externals/ruby1.9/ruby/test_env.rb b/test/externals/ruby1.9/ruby/test_env.rb
@@ -1,7 +1,7 @@
 require 'test/unit'
 
 class TestEnv < Test::Unit::TestCase
-  IGNORE_CASE = /bccwin|mswin|mingw/ =~ RUBY_PLATFORM
+  IGNORE_CASE = RbConfig::CONFIG['host_os'] =~ /bccwin|mswin|mingw/
   PATH_ENV = "PATH"
 
   def setup