diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-22 23:52:44 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-22 23:52:44 +0200 |
| commit | 5b1a49fdd3bef559991242a4ad7d3d1ed9cb48c8 (patch) | |
| tree | 9e74edadd344247e805f6bd3588a34fdf0dbfa21 /test/executable/suite.rb | |
| parent | 69246fc8ed0344eae4dab35286813a00010a08cb (diff) | |
| parent | 2abfc49bdc9a9f4e86c90aa968c302ca76c20812 (diff) | |
| download | coderay-5b1a49fdd3bef559991242a4ad7d3d1ed9cb48c8.tar.gz | |
Merge branch 'master' into lua-scanner
Conflicts:
lib/coderay/styles/alpha.rb
lib/coderay/token_kinds.rb
Diffstat (limited to 'test/executable/suite.rb')
| -rw-r--r-- | test/executable/suite.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/executable/suite.rb b/test/executable/suite.rb index d386f4b..997405c 100644 --- a/test/executable/suite.rb +++ b/test/executable/suite.rb @@ -14,7 +14,7 @@ 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 |