summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2011-08-27 17:25:35 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2011-08-27 17:25:35 +0200
commitcb0e91a18be79d1bfeeb344b99b046f3c2305f2e (patch)
tree91ca20b3cb1456a3b60b371cf0b368578f2841b5
parentf84072e906c0a9c48bb6148f7b5a16fbf1a86544 (diff)
downloadcoderay-cb0e91a18be79d1bfeeb344b99b046f3c2305f2e.tar.gz
fix some JRuby test problems
-rw-r--r--Gemfile2
-rw-r--r--test/executable/suite.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 2479a20..7151388 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gemspec
group :development do
gem "bundler", "~> 1.0.0"
gem "rake", "~> 0.9.2"
- gem "RedCloth"
+ gem "RedCloth", RUBY_PLATFORM == 'java' ? "= 4.2.7" : "~> 4.0.3"
gem "term-ansicolor"
gem "shoulda-context", "= 1.0.0.beta1" if RUBY_VERSION >= '1.8.7'
gem "json" unless RUBY_VERSION >= '1.9.1'
diff --git a/test/executable/suite.rb b/test/executable/suite.rb
index 42fb049..f3495d6 100644
--- a/test/executable/suite.rb
+++ b/test/executable/suite.rb
@@ -15,7 +15,7 @@ class TestCodeRayExecutable < Test::Unit::TestCase
ROOT_DIR = Pathname.new(File.dirname(__FILE__)) + '..' + '..'
EXECUTABLE = ROOT_DIR + 'bin' + 'coderay'
EXE_COMMAND =
- if RUBY_PLATFORM === 'java' && `ruby --ng -e ''` && $?.success?
+ if RUBY_PLATFORM === 'java' && `ruby --ng -e '' 2> /dev/null` && $?.success?
# use Nailgun
'ruby --ng -wI%s %s'
else