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: f8320285c0fe
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b3c87752f69f
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Feb 24, 2015

  1. Copy the full SHA
    a1cd9d5 View commit details
  2. [Truffle] Copied the junitreport frames.xsl file locally so we can cu…

    …stomize our spec reports.
    nirvdrum committed Feb 24, 2015
    Copy the full SHA
    9de7c1e View commit details
  3. Copy the full SHA
    b3c8775 View commit details
Showing with 1,051 additions and 1 deletion.
  1. +1 −1 spec/truffle/buildTestReports.xml
  2. +972 −0 spec/truffle/junit-frames.xsl
  3. +21 −0 test/pom.rb
  4. +57 −0 test/pom.xml
2 changes: 1 addition & 1 deletion spec/truffle/buildTestReports.xml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<fileset dir="tmp">
<include name="**/TEST-*.xml"/>
</fileset>
<report format="frames" todir="${genReportDir}/html"/>
<report format="frames" styledir="${basedir}/spec/truffle" todir="${genReportDir}/html"/>
</junitreport>
</target>
</project>
972 changes: 972 additions & 0 deletions spec/truffle/junit-frames.xsl

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions test/pom.rb
Original file line number Diff line number Diff line change
@@ -251,32 +251,53 @@ def truffle_spec_config(spec_type, generate_report)
profile 'truffle-specs-language-report' do

plugin :antrun do
dependency 'org.apache.ant', 'ant-junit', '${ant.version}'

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

execute_goals( 'run',
:id => 'junit-report-generation',
:phase => 'test',
:configuration => [ xml( '<target><ant antfile="${basedir}/../spec/truffle/buildTestReports.xml" dir="../" /></target>' ) ] )
end

end

profile 'truffle-specs-core-report' do

plugin :antrun do
dependency 'org.apache.ant', 'ant-junit', '${ant.version}'

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

execute_goals( 'run',
:id => 'junit-report-generation',
:phase => 'test',
:configuration => [ xml( '<target><ant antfile="${basedir}/../spec/truffle/buildTestReports.xml" dir="../" /></target>' ) ] )
end

end

profile 'truffle-specs-rubysl-report' do

plugin :antrun do
dependency 'org.apache.ant', 'ant-junit', '${ant.version}'

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

execute_goals( 'run',
:id => 'junit-report-generation',
:phase => 'test',
:configuration => [ xml( '<target><ant antfile="${basedir}/../spec/truffle/buildTestReports.xml" dir="../" /></target>' ) ] )
end

end
57 changes: 57 additions & 0 deletions test/pom.xml
Original file line number Diff line number Diff line change
@@ -835,7 +835,26 @@
</target>
</configuration>
</execution>
<execution>
<id>junit-report-generation</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<ant antfile="${basedir}/../spec/truffle/buildTestReports.xml" dir="../" />
</target>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
<version>${ant.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
@@ -882,7 +901,26 @@
</target>
</configuration>
</execution>
<execution>
<id>junit-report-generation</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<ant antfile="${basedir}/../spec/truffle/buildTestReports.xml" dir="../" />
</target>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
<version>${ant.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
@@ -929,7 +967,26 @@
</target>
</configuration>
</execution>
<execution>
<id>junit-report-generation</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<ant antfile="${basedir}/../spec/truffle/buildTestReports.xml" dir="../" />
</target>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
<version>${ant.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>