Skip to content

Commit 23aabc2

Browse files
authored
Merge pull request #371 from kares/jruby-baseline
baseline changes to help (JRuby) development
2 parents fb6eefe + 362a7c3 commit 23aabc2

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

Rakefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ task :check_env do
142142
end
143143

144144
desc "Testing library (pure ruby)"
145-
task :test_pure => [ :clean, :check_env, :do_test_pure ]
145+
task :test_pure => [ :set_env_pure, :check_env, :do_test_pure ]
146+
task(:set_env_pure) { ENV['JSON'] = 'pure' }
146147

147148
UndocumentedTestTask.new do |t|
148149
t.name = 'do_test_pure'
@@ -153,10 +154,7 @@ UndocumentedTestTask.new do |t|
153154
end
154155

155156
desc "Testing library (pure ruby and extension)"
156-
task :test do
157-
sh "env JSON=pure #{BUNDLE} exec rake test_pure" or exit 1
158-
sh "env JSON=ext #{BUNDLE} exec rake test_ext" or exit 1
159-
end
157+
task :test => [ :test_pure, :test_ext ]
160158

161159
namespace :gems do
162160
desc 'Install all development gems'
@@ -223,7 +221,8 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
223221
end
224222

225223
desc "Testing library (jruby)"
226-
task :test_ext => [ :check_env, :create_jar, :do_test_ext ]
224+
task :test_ext => [ :set_env_ext, :create_jar, :check_env, :do_test_ext ]
225+
task(:set_env_ext) { ENV['JSON'] = 'ext' }
227226

228227
UndocumentedTestTask.new do |t|
229228
t.name = 'do_test_ext'

0 commit comments

Comments
 (0)