headius

require 'tmpdir'

describe "A file required from a load path entry with an embedded symlink" do
  it "leaves __FILE__ unexpanded" do
    Dir.mktmpdir do |path|
      Dir.mkdir "#{path}/real"
      File.symlink "#{path}/real", "#{path}/link"
      File.write("#{path}/real/GH1940_test.rb", "class GH1940; def self.__file__; __FILE__; end; end")

      $LOAD_PATH << "#{path}/link"

headius

# format.rb: Written by Tadayoshi Funaba 1999-2009
# $Id: format.rb,v 2.43 2008-01-17 20:16:31+09 tadf Exp $

class Date
    ZONES = {
      'ut'  =>  0*3600, 'gmt' =>  0*3600, 'est' => -5*3600, 'edt' => -4*3600,
      'cst' => -6*3600, 'cdt' => -5*3600, 'mst' => -7*3600, 'mdt' => -6*3600,
      'pst' => -8*3600, 'pdt' => -7*3600,
      'a'   =>  1*3600, 'b'   =>  2*3600, 'c'   =>  3*3600, 'd'   =>  4*3600,
      'e'   =>  5*3600, 'f'   =>  6*3600, 'g'   =>  7*3600, 'h'   =>  8*3600,

headius

diff --git a/core/src/main/java/org/jruby/RubyEncoding.java b/core/src/main/java/org/jruby/RubyEncoding.java
index f872076..5e2c025 100755
--- a/core/src/main/java/org/jruby/RubyEncoding.java
+++ b/core/src/main/java/org/jruby/RubyEncoding.java
@@ -81,7 +81,7 @@ public class RubyEncoding extends RubyObject implements Constantizable {
     private final Object constant;
 
     private RubyEncoding(Ruby runtime, byte[] name, int p, int end, boolean isDummy) {
-        this(runtime, new ByteList(name, p, end), null, false);
+        this(runtime, new ByteList(name, p, end), null, isDummy);

headius

    def start_thread
      1.times {
        begin
          p
        rescue
          p
        ensure
          p
        end
      }

headius

JRuby zlib

       user     system      total        real
write  0.054059   0.007411   0.061470 (  0.047307)
read  0.019310   0.002438   0.021748 (  0.011610)

JRuby pr-zlib

       user     system      total        real
write  9.660000   0.070000   9.730000 (  8.077000)

headius

~/projects/ruby $ changelog
Fri Oct 31 15:56:46 2014  Charles Oliver Nutter  <headius@headius.com>

	* object.c: Make a meaningless change to test changelog script.

headius

diff -ru ../ruby/test/lib/leakchecker.rb test/mri/lib/leakchecker.rb
--- ../ruby/test/lib/leakchecker.rb	2014-11-04 23:26:38.000000000 -0600
+++ test/mri/lib/leakchecker.rb	2014-11-08 11:46:12.000000000 -0600
@@ -66,7 +66,6 @@
         end
         puts "Leaked file descriptor: #{test_name}: #{fd}#{str}"
       }
-      #system("lsof -p #$$") if !fd_leaked.empty?
       h.each {|fd, list|
         next if list.length <= 1

headius

diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
index cf325de..cbc0c82 100644
--- a/core/src/main/java/org/jruby/RubyThread.java
+++ b/core/src/main/java/org/jruby/RubyThread.java
@@ -55,6 +55,7 @@ import org.jruby.internal.runtime.NativeThread;
 import org.jruby.internal.runtime.RubyRunnable;
 import org.jruby.internal.runtime.ThreadLike;
 import org.jruby.internal.runtime.ThreadService;
+import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.Block;

headius

# Test the performance of testing for equality in a class that includes
# a module and calls super on it. See if there is any difference between
# arg == Const and Const == arg for the runtimes.
#

require 'rubygems'
require 'benchmark'

A = 1
B = 2

headius

require "singleton"
require "socket"

ACCEPT_EVENT  = 0x01
RECEIVE_EVENT = 0x02
WRITE_EVENT   = 0x04
# Y_EVENT     = 0x08
# Z_EVENT     = 0x10
# Etc.