Skip to content

Commit cb0e91a

Browse files
committed
fix some JRuby test problems
1 parent f84072e commit cb0e91a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gemspec
88
group :development do
99
gem "bundler", "~> 1.0.0"
1010
gem "rake", "~> 0.9.2"
11-
gem "RedCloth"
11+
gem "RedCloth", RUBY_PLATFORM == 'java' ? "= 4.2.7" : "~> 4.0.3"
1212
gem "term-ansicolor"
1313
gem "shoulda-context", "= 1.0.0.beta1" if RUBY_VERSION >= '1.8.7'
1414
gem "json" unless RUBY_VERSION >= '1.9.1'

test/executable/suite.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class TestCodeRayExecutable < Test::Unit::TestCase
1515
ROOT_DIR = Pathname.new(File.dirname(__FILE__)) + '..' + '..'
1616
EXECUTABLE = ROOT_DIR + 'bin' + 'coderay'
1717
EXE_COMMAND =
18-
if RUBY_PLATFORM === 'java' && `ruby --ng -e ''` && $?.success?
18+
if RUBY_PLATFORM === 'java' && `ruby --ng -e '' 2> /dev/null` && $?.success?
1919
# use Nailgun
2020
'ruby --ng -wI%s %s'
2121
else

0 commit comments

Comments
 (0)