Skip to content

Commit 64ea77a

Browse files
committed
improve setup of rake tests
1 parent 810d140 commit 64ea77a

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ source 'https://rubygems.org'
22

33
# Specify your gem's dependencies in the gemspec
44
gemspec
5+
6+
# for the rake task
7+
gem 'ruby-maven', '~> 3.3.8'

Rakefile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#-*- mode: ruby -*-
22

33
begin
4-
require 'maven/ruby/tasks'
4+
require 'ruby-maven'
55
rescue LoadError
66
warn "ruby-maven not available - some tasks will not work " <<
77
"either `gem install ruby-maven' or use mvn instead of rake"
@@ -16,20 +16,22 @@ rescue LoadError
1616
end
1717
end
1818
else
19-
Rake::Task[:jar].clear
19+
#Rake::Task[:jar].clear rescue nil
2020
desc "Package jopenssl.jar with the compiled classes"
21-
task :jar => :maven do
22-
maven.prepare_package '-Dmaven.test.skip=true'
21+
task :jar do
22+
RubyMaven.exec( 'prepare_package -Dmaven.test.skip=true' )
2323
end
2424
namespace :jar do
2525
desc "Package jopenssl.jar file (and dependendent jars)"
26-
task :all => :maven do
27-
maven.package '-Dmaven.test.skip=true'
26+
task :all do
27+
RubyMaven.exec( 'package -Dmaven.test.skip=true' )
2828
end
2929
end
3030
end
3131

32-
# the actual build configuration is inside the Mavenfile
32+
task :build do
33+
RubyMaven.exec('package -Dmaven.test.skip')
34+
end
3335

3436
task :default => :build
3537

@@ -64,4 +66,4 @@ namespace :integration do
6466
lib = [ 'lib', 'src/test/integration' ]
6567
ruby "-I#{lib.join(':')} -e \"#{loader}\" #{test_files.map { |f| "\"#{f}\"" }.join(' ')}"
6668
end
67-
end
69+
end

src/test/ruby/test_helper.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
puts Java::OrgBouncycastleJceProvider::BouncyCastleProvider.new.info
1212
else
1313
base_dir = File.expand_path('../../..', File.dirname(__FILE__))
14-
$CLASSPATH << File.join(base_dir, 'pkg/classes')
14+
15+
jar = File.join(base_dir, 'lib/jopenssl.jar')
16+
raise "jopenssl.jar jar not found" unless jar; $CLASSPATH << jar
17+
1518
jar = Dir[File.join(base_dir, 'lib/org/bouncycastle/**/bcprov-*.jar')].first
1619
raise "bcprov jar not found" unless jar; $CLASSPATH << jar
1720
jar = Dir[File.join(base_dir, 'lib/org/bouncycastle/**/bcpkix-*.jar')].first
@@ -205,4 +208,4 @@ def issue_crl(revoke_info, serial, lastup, nextup, extensions,
205208
Dir.glob("#{File.join(base, sub)}/**/test_*.rb").each do |test|
206209
require test
207210
end
208-
end
211+
end

0 commit comments

Comments
 (0)