Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7d010228a580
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1e379ff2290a
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Feb 24, 2015

  1. [Truffle] Removed a debug line.

    @nirvdrum
    nirvdrum committed Feb 24, 2015
    Copy the full SHA
    91fe454 View commit details

  2. [Truffle] Added new profiles for generating spec reports. 

    The new profiles are truffle-specs-language-report, truffle-specs-core-report, and truffle-specs-rubysl-report.
    @nirvdrum
    nirvdrum committed Feb 24, 2015
    Copy the full SHA
    1e379ff View commit details
Showing with 255 additions and 138 deletions.
  1. +2 −1 pom.rb
  2. +27 −0 pom.xml
  3. +0 −2 spec/truffle/truffle_formatter.rb
  4. +83 −135 test/pom.rb
  5. +143 −0 test/pom.xml
3 changes: 2 additions & 1 deletion pom.rb
View file
Original file line number Diff line number Diff line change
@@ -177,7 +177,8 @@

[
'rake', 'exec', 'truffle-specs-language', 'truffle-specs-core',
'truffle-specs-rubysl', 'truffle-test-pe'
'truffle-specs-rubysl', 'truffle-specs-language-report',
'truffle-specs-core-report', 'truffle-specs-rubysl-report', 'truffle-test-pe'
].each do |name|
profile name do

27 changes: 27 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -570,6 +570,33 @@
<module>test</module>
</modules>
</profile>
<profile>
<id>truffle-specs-language-report</id>
<build>
<defaultGoal>package</defaultGoal>
</build>
<modules>
<module>test</module>
</modules>
</profile>
<profile>
<id>truffle-specs-core-report</id>
<build>
<defaultGoal>package</defaultGoal>
</build>
<modules>
<module>test</module>
</modules>
</profile>
<profile>
<id>truffle-specs-rubysl-report</id>
<build>
<defaultGoal>package</defaultGoal>
</build>
<modules>
<module>test</module>
</modules>
</profile>
<profile>
<id>truffle-test-pe</id>
<build>
2 changes: 0 additions & 2 deletions spec/truffle/truffle_formatter.rb
View file
Original file line number Diff line number Diff line change
@@ -176,8 +176,6 @@ def mkdir_p(dir)
parts.each do |part|
sub_path = File.join(sub_path, part)

puts "#{sub_path} exists?: #{Dir.exist?(sub_path)}"

Dir.mkdir(sub_path) unless Dir.exist?(sub_path)
end
end
218 changes: 83 additions & 135 deletions test/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,51 @@
version = File.read( File.join( basedir, '..', 'VERSION' ) ).strip

def truffle_spec_config(spec_type, generate_report)
'<target>' +
'<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">' +
'<arg value="-X+T" />' +
'<arg value="-Xparser.warn.useless_use_of=false" />' +
'<arg value="-Xparser.warn.not_reached=false" />' +
'<arg value="-Xparser.warn.grouped_expressions=false" />' +
'<arg value="-Xparser.warn.shadowing_local=false" />' +
'<arg value="-Xparser.warn.regex_condition=false" />' +
'<arg value="-Xparser.warn.argument_prefix=false" />' +
'<arg value="-Xparser.warn.ambiguous_argument=false" />' +
'<arg value="-Xparser.warn.flags_ignored=false" />' +
'<arg value="-J-ea" />' +
'<arg value="-J-Xmx1G" />' +
'<arg value="spec/mspec/bin/mspec" />' +
'<arg value="run" />' +
(generate_report ? '<arg value="-f" /><arg value="${jruby.home}/spec/truffle/truffle_formatter.rb" />' : '') +
'<arg value="-t" />' +
# Workaround for RubySpec #292
'<arg value="spec/truffle/spec-wrapper" />' +
#'<arg value="bin/jruby" />' +
#'<arg value="-T" />' +
#'<arg value="-X+T" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.useless_use_of=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.not_reached=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.grouped_expressions=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.shadowing_local=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.regex_condition=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.argument_prefix=false" />' +
#'<arg value="-T" />' +
#'<arg value="-J-ea" />' +
'<arg value="--config" />' +
'<arg value="spec/truffle/truffle.mspec" />' +
'<arg value="--excl-tag" />' +
'<arg value="fails" />' +
"<arg value=\":#{spec_type}\" />" +
'</exec>' +
'</target>'
end

project 'JRuby Integration Tests' do

model_version '4.0.0'
@@ -174,47 +221,7 @@
execute_goals( 'run',
:id => 'rake',
:phase => 'test',
:configuration => [ xml(
'<target>' +
'<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">' +
'<arg value="-X+T" />' +
'<arg value="-Xparser.warn.useless_use_of=false" />' +
'<arg value="-Xparser.warn.not_reached=false" />' +
'<arg value="-Xparser.warn.grouped_expressions=false" />' +
'<arg value="-Xparser.warn.shadowing_local=false" />' +
'<arg value="-Xparser.warn.regex_condition=false" />' +
'<arg value="-Xparser.warn.argument_prefix=false" />' +
'<arg value="-J-ea" />' +
'<arg value="-J-Xmx1G" />' +
'<arg value="spec/mspec/bin/mspec" />' +
'<arg value="run" />' +
'<arg value="-t" />' +
# Workaround for RubySpec #292
'<arg value="spec/truffle/spec-wrapper" />' +
#'<arg value="bin/jruby" />' +
#'<arg value="-T" />' +
#'<arg value="-X+T" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.useless_use_of=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.not_reached=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.grouped_expressions=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.shadowing_local=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.regex_condition=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.argument_prefix=false" />' +
#'<arg value="-T" />' +
#'<arg value="-J-ea" />' +
'<arg value="--config" />' +
'<arg value="spec/truffle/truffle.mspec" />' +
'<arg value="--excl-tag" />' +
'<arg value="fails" />' +
'<arg value=":language" />' +
'</exec>' +
'</target>' ) ] )
:configuration => [ xml( truffle_spec_config(:language, false) ) ] )
end

end
@@ -225,53 +232,7 @@
execute_goals( 'run',
:id => 'rake',
:phase => 'test',
:configuration => [ xml(
'<target>' +
'<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">' +
'<arg value="-X+T" />' +
'<arg value="-Xparser.warn.useless_use_of=false" />' +
'<arg value="-Xparser.warn.not_reached=false" />' +
'<arg value="-Xparser.warn.grouped_expressions=false" />' +
'<arg value="-Xparser.warn.shadowing_local=false" />' +
'<arg value="-Xparser.warn.regex_condition=false" />' +
'<arg value="-Xparser.warn.argument_prefix=false" />' +
'<arg value="-Xparser.warn.ambiguous_argument=false" />' +
'<arg value="-Xparser.warn.flags_ignored=false" />' +
'<arg value="-J-ea" />' +
'<arg value="-J-Xmx1G" />' +
'<arg value="spec/mspec/bin/mspec" />' +
'<arg value="run" />' +
'<arg value="-t" />' +
# Workaround for RubySpec #292
'<arg value="spec/truffle/spec-wrapper" />' +
#'<arg value="bin/jruby" />' +
#'<arg value="-T" />' +
#'<arg value="-X+T" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.useless_use_of=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.not_reached=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.grouped_expressions=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.shadowing_local=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.regex_condition=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.argument_prefix=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.ambiguous_argument=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.flags_ignored=false" />' +
#'<arg value="-T" />' +
#'<arg value="-J-ea" />' +
'<arg value="--config" />' +
'<arg value="spec/truffle/truffle.mspec" />' +
'<arg value="--excl-tag" />' +
'<arg value="fails" />' +
'<arg value=":core" />' +
'</exec>' +
'</target>' ) ] )
:configuration => [ xml( truffle_spec_config(:core, false) ) ] )
end

end
@@ -282,53 +243,40 @@
execute_goals( 'run',
:id => 'rake',
:phase => 'test',
:configuration => [ xml(
'<target>' +
'<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">' +
'<arg value="-X+T" />' +
'<arg value="-Xparser.warn.useless_use_of=false" />' +
'<arg value="-Xparser.warn.not_reached=false" />' +
'<arg value="-Xparser.warn.grouped_expressions=false" />' +
'<arg value="-Xparser.warn.shadowing_local=false" />' +
'<arg value="-Xparser.warn.regex_condition=false" />' +
'<arg value="-Xparser.warn.argument_prefix=false" />' +
'<arg value="-Xparser.warn.ambiguous_argument=false" />' +
'<arg value="-Xparser.warn.flags_ignored=false" />' +
'<arg value="-J-ea" />' +
'<arg value="-J-Xmx1G" />' +
'<arg value="spec/mspec/bin/mspec" />' +
'<arg value="run" />' +
'<arg value="-t" />' +
# Workaround for RubySpec #292
'<arg value="spec/truffle/spec-wrapper" />' +
#'<arg value="bin/jruby" />' +
#'<arg value="-T" />' +
#'<arg value="-X+T" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.useless_use_of=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.not_reached=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.grouped_expressions=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.shadowing_local=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.regex_condition=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.argument_prefix=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.ambiguous_argument=false" />' +
#'<arg value="-T" />' +
#'<arg value="-Xparser.warn.flags_ignored=false" />' +
#'<arg value="-T" />' +
#'<arg value="-J-ea" />' +
'<arg value="--config" />' +
'<arg value="spec/truffle/truffle.mspec" />' +
'<arg value="--excl-tag" />' +
'<arg value="fails" />' +
'<arg value=":rubysl" />' +
'</exec>' +
'</target>' ) ] )
:configuration => [ xml( truffle_spec_config(:rubysl, false) ) ] )
end

end

profile 'truffle-specs-language-report' do

plugin :antrun do
execute_goals( 'run',
:id => 'rake',
:phase => 'test',
:configuration => [ xml( truffle_spec_config(:language, true) ) ] )
end

end

profile 'truffle-specs-core-report' do

plugin :antrun do
execute_goals( 'run',
:id => 'rake',
:phase => 'test',
:configuration => [ xml( truffle_spec_config(:core, true) ) ] )
end

end

profile 'truffle-specs-rubysl-report' do

plugin :antrun do
execute_goals( 'run',
:id => 'rake',
:phase => 'test',
:configuration => [ xml( truffle_spec_config(:rubysl, true) ) ] )
end

end
Loading