jruby · May 30, 2015 · May 30, 2015 · May 30, 2015
Showing with 31 additions and 6 deletions.

+10 −2 .travis.yml

+21 −4 test/test_backquote.rb
diff --git a/.travis.yml b/.travis.yml
@@ -30,16 +30,24 @@ matrix:
     # there is one integration test which uses a external jar for jdk7+
     - jdk: oraclejdk7
       env: TARGET='main'
+    # nice to have at least some feedback on jdk 7/8
+    - jdk: openjdk7
+      env: TARGET='test-extended'
+    - jdk: openjdk7
+      env: TARGET='spec:ruby19:fast'
+    - jdk: oraclejdk8
+      env: TARGET='spec:ruby19:fast'
   fast_finish: true
 
 branches:
   only:
     - master
     - jruby-1_7
     - /^test-.*$/
+    - /^ha-feature/
 
-before_install:
-  - if [[ $TRAVIS_JDK_VERSION = 'oraclejdk8' ]]; then sudo apt-get update; sudo apt-get install oracle-java8-installer; else true; fi
+#before_install:
+#  - if [[ $TRAVIS_JDK_VERSION = 'oraclejdk8' ]]; then sudo apt-get update; sudo apt-get install oracle-java8-installer; else true; fi
 
 install: /bin/true
 # |^[[:space:]]*\[exec\][[:space:]]*$

diff --git a/test/test_backquote.rb b/test/test_backquote.rb
@@ -28,9 +28,21 @@ def test_system_special_commands
   #JRUBY-2251
   def test_empty_backquotes
     if (!WINDOWS)
-      assert_equal("", ``)    # empty
-      assert_equal("", `   `) # spaces
-      assert_equal("", `\n`)
+      if RUBY_VERSION > '1.9' && ENV_JAVA['java.specification.version'] > '1.6'
+        # works as expected on Java 7+ (using process launching API)
+        assert_raise(Errno::ENOENT) {``}
+        assert_raise(Errno::ENOENT) {`   `}
+        #assert_raise(Errno::ENOENT) {`\n`}
+        pend "#{__method__}: `\\n` does not raise Errno::ENOENT as expected"
+      else
+        if RUBY_VERSION < '1.9' && ENV_JAVA['java.specification.version'] > '1.6'
+          pend "#{__method__}: `` does not work the same as MRI 1.8.7 (under Java 7+)"
+        else
+          assert_equal("", ``)    # empty
+          assert_equal("", `   `) # spaces
+          assert_equal("", `\n`)
+        end
+      end
     else # we just check that empty backquotes won't blow up JRuby
       ``    rescue nil
       `   ` rescue nil
@@ -49,10 +61,15 @@ def test_backquotes_with_redirects_pass_through_shell
 
       assert_equal "arguments: one two\n", `./arguments one two 2> /dev/null`
       assert_equal "", `./arguments three four > /dev/null`
-      ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+      # ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
       assert_equal "arguments: five six\n", jruby(%{-e 'puts "arguments: five six"' 2> /dev/null})
     end
   ensure
     File.delete("arguments") rescue nil
   end
+
+  private
+
+  def pend(msg); warn msg end unless method_defined? :pend
+
 end