File tree 2 files changed +10
-6
lines changed
2 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ class TaskManager
27
27
include Rake ::TaskManager
28
28
end
29
29
30
- RUBY = File . realpath ( ENV [ "RUBY" ] || Gem . ruby )
30
+ RUBY = ( ENV [ "RUBY" ] || Gem . ruby )
31
31
32
32
def setup
33
33
ARGV . clear
@@ -124,5 +124,9 @@ def jruby9?
124
124
jruby? && ( JRUBY_VERSION >= "9.0.0.0" )
125
125
end
126
126
127
+ def jruby90?
128
+ jruby? && JRUBY_VERSION . start_with? ( "9.0." )
129
+ end
130
+
127
131
include RakefileDefinitions
128
132
end
Original file line number Diff line number Diff line change @@ -182,7 +182,7 @@ def test_sh_with_multiple_arguments
182
182
end
183
183
184
184
def test_sh_with_spawn_options
185
- omit "JRuby does not support spawn options" if jruby ?
185
+ omit "JRuby does not support spawn options" if jruby90 ?
186
186
187
187
echocommand
188
188
@@ -198,7 +198,7 @@ def test_sh_with_spawn_options
198
198
end
199
199
200
200
def test_sh_with_hash_option
201
- omit "JRuby does not support spawn options" if jruby ?
201
+ omit "JRuby does not support spawn options" if jruby90 ?
202
202
check_expansion
203
203
204
204
verbose ( false ) {
@@ -241,7 +241,7 @@ def test_sh_noop
241
241
end
242
242
243
243
def test_sh_chdir
244
- omit "JRuby does not support spawn options" if jruby ?
244
+ omit "JRuby does not support spawn options" if jruby90 ?
245
245
246
246
Dir . mkdir "chdir_test"
247
247
out , err = capture_output do
@@ -257,7 +257,7 @@ def test_sh_chdir
257
257
def test_sh_bad_option
258
258
# Skip on JRuby because option checking is performed by spawn via system
259
259
# now.
260
- omit "JRuby does not support spawn options" if jruby ?
260
+ omit "JRuby does not support spawn options" if jruby90 ?
261
261
262
262
shellcommand
263
263
@@ -402,7 +402,7 @@ def assert_echoes_fully
402
402
end
403
403
404
404
def test_ruby_with_multiple_arguments
405
- omit if jruby9 ? # https://github.com/jruby/jruby/issues/3653
405
+ omit if jruby90 ? # https://github.com/jruby/jruby/issues/3653
406
406
407
407
check_no_expansion
408
408
You can’t perform that action at this time.
0 commit comments