JRUBY-4042: [windows] jruby.bat without parameters fails

Also, added a unit test for this.
jruby · Oct 4, 2009 · 74d9163 · 74d9163
1 parent 7a96256
commit 74d9163
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/bin/_jrubyvmopts.bat b/bin/_jrubyvmopts.bat
@@ -166,7 +166,13 @@ set _CMP=
 goto vmoptsLoop
 
 :vmoptsDone
+
+rem substitute _P only if _RUBY_OPTS is defined,
+rem otherwise we'll get an error.
+if not defined _RUBY_OPTS goto rubyoptsDone
 set _RUBY_OPTS=%_RUBY_OPTS:_P=|%
+
+:rubyoptsDone
 set _VM_OPTS=%_VM_OPTS% %_JAVA_VM% %_MEM% %_STK% %_DFLT_VM_OPTS%
 set _DFLT_VM_OPTS=
 set _MEM=

diff --git a/test/test_launching_by_shell_script.rb b/test/test_launching_by_shell_script.rb
@@ -14,6 +14,12 @@ def test_launch_script
     assert_equal 0, $?.exitstatus
   end
 
+  # JRUBY-4042
+  def test_jruby_without_args
+    jruby_with_pipe("echo puts 1")
+    assert_equal 0, $?.exitstatus
+  end
+
   if WINDOWS
     def test_system_call_without_stdin_data_doesnt_hang
       out = jruby(%q{-e "system 'dir test'"})