jruby · Mar 16, 2015 · Mar 16, 2015
Showing with 11 additions and 24 deletions.

+0 −2 .travis.yml

+2 −7 core/src/main/java/org/jruby/RubyIO.java

+9 −9 maven/jruby-jars/src/it/extended/src/test/java/org/example/SimpleTest.java

+0 −6 spec/regression/GH-2627_stdio_should_reflect_pipe_tty_spec.rb
diff --git a/.travis.yml b/.travis.yml
@@ -27,8 +27,6 @@ matrix:
     # these profile do no need to run for all JDKs
     - env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
       jdk: oraclejdk7
-    - env: PHASE='-Pmain,test -Dinvoker.test=extended'
-      jdk: openjdk7
   fast_finish: true
 
 

diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -39,7 +39,6 @@
 import jnr.constants.platform.OpenFlags;
 import jnr.enxio.channels.NativeDeviceChannel;
 import jnr.enxio.channels.NativeSelectableChannel;
-import jnr.posix.POSIX;
 import org.jcodings.transcode.EConvFlags;
 import org.jruby.runtime.Helpers;
 import org.jruby.util.StringSupport;
@@ -1829,19 +1828,15 @@ public RubyBoolean eof_p(ThreadContext context) {
     @JRubyMethod(name = {"tty?", "isatty"})
     public RubyBoolean tty_p(ThreadContext context) {
         Ruby runtime = context.runtime;
-        POSIX posix = runtime.getPosix();
         OpenFile fptr;
 
         fptr = getOpenFileChecked();
 
         fptr.lock();
         try {
-            if (posix.isNative() && fptr.fd().realFileno != -1) {
-                return posix.libc().isatty(fptr.getFileno()) == 0 ? runtime.getFalse() : runtime.getTrue();
-            } else if (fptr.isStdio()) {
-                // This is a bit of a hack for platforms where we can't do native stdio
+            if (fptr.isStdio()) return runtime.getTrue();
+            if (runtime.getPosix().isNative() && runtime.getPosix().libc().isatty(fptr.getFileno()) != 0)
                 return runtime.getTrue();
-            }
         } finally {
             fptr.unlock();
         }

diff --git a/maven/jruby-jars/src/it/extended/src/test/java/org/example/SimpleTest.java b/maven/jruby-jars/src/it/extended/src/test/java/org/example/SimpleTest.java
@@ -92,15 +92,15 @@ private void runIt(String index, String script) throws Exception {
     // 	runIt("objectspace");
     // }
 
-    @Test
-    public void testMRI() throws Exception {
-        runIt("mri", "ENV['EXCLUDE_DIR']='test/mri/excludes';");
-    }
-
-    @Test
-    public void testSlow() throws Exception {
-       	runIt("slow");
-    }
+//    @Test
+//    public void testMRI() throws Exception {
+//        runIt("mri", "ENV['EXCLUDE_DIR']='test/mri/excludes';");
+//    }
+//
+//    @Test
+//    public void testSlow() throws Exception {
+//       	runIt("slow");
+//    }
 
     @Test
     public void testJRuby() throws Exception {

diff --git a/spec/regression/GH-2627_stdio_should_reflect_pipe_tty_spec.rb b/spec/regression/GH-2627_stdio_should_reflect_pipe_tty_spec.rb