Skip to content

Commit

Permalink
[build] get finally all installed before running the tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mkristian committed Nov 14, 2014
1 parent 968a634 commit b4f75d5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion antlib/extra.xml
Expand Up @@ -2,7 +2,7 @@
<target name='mvn'>
<exec executable='mvn'>
<arg line='-q'/>
<arg line='-Pmain,complete'/>
<arg line='-Ptest,bootstrap,main,complete'/>
</exec>
</target>
<target name='test-jruby-jars-jruby.1.9' depends='mvn'>
Expand Down
7 changes: 4 additions & 3 deletions test/pom.rb
Expand Up @@ -5,7 +5,9 @@ def initialize( version, basedir )
@basedir = basedir
@names = ""
@targets = ""
@rake = Dir[File.join(@basedir, "../lib/ruby/gems/shared/gems/rake-*/lib/rake/rake_test_loader.rb")].first.sub( /.*\/..\/lib\//, 'lib/' )
@rake = 'lib/ruby/gems/shared/gems/rake-10.1.0/lib/rake/rake_test_loader.rb'
# TODO
#Dir[File.join(@basedir, "../lib/ruby/gems/shared/gems/rake-*/lib/rake/rake_test_loader.rb")]).first.sub( /.*\/..\/lib\//, 'lib/' )
end
def names
@names[0..-2]
Expand All @@ -29,7 +31,6 @@ def create_target( name, complete )
jars = "lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-#{@version}.jar"
end
@names << name + ","
#
@targets << "<target name='#{name}' depends='mvn'>\n<exec executable='java' failonerror='true'>\n<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>\n<arg value='-cp'/>\n<arg value='core/target/test-classes:test/target/test-classes:#{jars}'/>\n<arg value='org.jruby.Main'/>\n<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>\n<arg value='#{@rake}'/>\n#{files}<arg value='-v'/>\n</exec>\n</target>\n"
end
end
Expand Down Expand Up @@ -144,6 +145,6 @@ def create_target( name, complete )
#TODO builder.create_target( 'mri.1.9', false )
builder.create_target( 'rubicon.1.9', true )

File.write(File.join(basedir, '..', 'antlib', 'extra.xml'), "<project basedir='..'>\n<target name='mvn'>\n<exec executable='mvn'>\n<arg line='-q'/>\n<arg line='-Pmain,complete'/>\n</exec>\n</target>\n#{builder.targets}<target description='test using jruby-complete or jruby-core/jruby-stdlib jars' name='test-jruby-jars' depends='#{builder.names}'/></project>")
File.write(File.join(basedir, '..', 'antlib', 'extra.xml'), "<project basedir='..'>\n<target name='mvn'>\n<exec executable='mvn'>\n<arg line='-q'/>\n<arg line='-Ptest,bootstrap,main,complete'/>\n</exec>\n</target>\n#{builder.targets}<target description='test using jruby-complete or jruby-core/jruby-stdlib jars' name='test-jruby-jars' depends='#{builder.names}'/></project>")

end

0 comments on commit b4f75d5

Please sign in to comment.