diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 16:06:02 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 16:06:02 +0200 |
| commit | 0013b649f714f23eef0859921fa7804ca7caef76 (patch) | |
| tree | 7c278ee7c420729b4738fe2a195e529ffd2bb6da /test/executable/suite.rb | |
| parent | addcbd446066d0da1627112814e3ce1b8d404da0 (diff) | |
| parent | 64ca2ae8ad5130bdcf652aa7aa08298de00f20f4 (diff) | |
| download | coderay-0013b649f714f23eef0859921fa7804ca7caef76.tar.gz | |
Merge branch 'master' into go-scanner
Conflicts:
lib/coderay/helpers/file_type.rb
Diffstat (limited to 'test/executable/suite.rb')
| -rw-r--r-- | test/executable/suite.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/executable/suite.rb b/test/executable/suite.rb index d386f4b..ac0ff1d 100644 --- a/test/executable/suite.rb +++ b/test/executable/suite.rb @@ -14,13 +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 + RUBY_COMMAND = 'ruby' EXE_COMMAND = if RUBY_PLATFORM === 'java' && `ruby --ng -e '' 2> /dev/null` && $?.success? # use Nailgun - "#{RUBY_COMMAND}--ng -I%s %s" + "#{RUBY_COMMAND}--ng -w -I%s %s" else - "#{RUBY_COMMAND} -I%s %s" + "#{RUBY_COMMAND} -w -I%s %s" end % [ROOT_DIR + 'lib', EXECUTABLE] def coderay args, options = {} |