summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-02-20 21:15:00 +0100
committerKornelius Kalnbach <murphy@rubychan.de>2013-02-20 21:15:00 +0100
commit9e6364cd659cc26f32fc3732ed091653176ac987 (patch)
treef57d7ed199785dc306c3a0d37a404204f51701a7
parent972527dca2476e034526f946f7d71a04a51f6eab (diff)
downloadcoderay-9e6364cd659cc26f32fc3732ed091653176ac987.tar.gz
trying to enable ruby-head tests in Travis
-rw-r--r--.travis.yml2
-rw-r--r--test/executable/suite.rb5
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 63a9b0b..7c29c56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ rvm:
- jruby-19mode
- rbx-18mode
- rbx-19mode
- # - ruby-head # test again later: RedCloth not compiling
+ - ruby-head # test again later: RedCloth not compiling
- jruby-head
- ree
branches:
diff --git a/test/executable/suite.rb b/test/executable/suite.rb
index f3495d6..d386f4b 100644
--- a/test/executable/suite.rb
+++ b/test/executable/suite.rb
@@ -14,12 +14,13 @@ class TestCodeRayExecutable < Test::Unit::TestCase
ROOT_DIR = Pathname.new(File.dirname(__FILE__)) + '..' + '..'
EXECUTABLE = ROOT_DIR + 'bin' + 'coderay'
+ RUBY_COMMAND = RUBY_VERSION < '2.0.0' ? 'ruby -w' : 'ruby' # Ruby 2 currently throws warnings for bundler
EXE_COMMAND =
if RUBY_PLATFORM === 'java' && `ruby --ng -e '' 2> /dev/null` && $?.success?
# use Nailgun
- 'ruby --ng -wI%s %s'
+ "#{RUBY_COMMAND}--ng -I%s %s"
else
- 'ruby -wI%s %s'
+ "#{RUBY_COMMAND} -I%s %s"
end % [ROOT_DIR + 'lib', EXECUTABLE]
def coderay args, options = {}