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: 5ccc6788f9cd
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b80323ea20da
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 22, 2015

  1. [Truffle] Add MRI test profile to pom files.

    @bjfish
    bjfish committed Apr 22, 2015
    Copy the full SHA
    8fcbcb8 View commit details

  2. Merge pull request #2862 from bjfish/truffle_mri_tests_mvn 

    [Truffle] Add MRI test profile to pom files.
    @eregon
    eregon committed Apr 22, 2015
    Copy the full SHA
    b80323e View commit details
Showing with 57 additions and 1 deletion.
  1. +1 −1 pom.rb
  2. +9 −0 pom.xml
  3. +19 −0 test/pom.rb
  4. +28 −0 test/pom.xml
2 changes: 1 addition & 1 deletion pom.rb
View file
Original file line number Diff line number Diff line change
@@ -178,7 +178,7 @@
[
'rake', 'exec', 'truffle-specs-language', 'truffle-specs-core',
'truffle-specs-library', 'truffle-specs-language-report',
'truffle-specs-core-report', 'truffle-specs-library-report', 'truffle-test-pe'
'truffle-specs-core-report', 'truffle-specs-library-report', 'truffle-test-pe', 'truffle-mri-tests'
].each do |name|
profile name do

9 changes: 9 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -606,6 +606,15 @@
<module>test</module>
</modules>
</profile>
<profile>
<id>truffle-mri-tests</id>
<build>
<defaultGoal>package</defaultGoal>
</build>
<modules>
<module>test</module>
</modules>
</profile>
<profile>
<id>bootstrap</id>
<modules>
19 changes: 19 additions & 0 deletions test/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -317,4 +317,23 @@ def truffle_spec_config(spec_type, generate_report)

end


profile 'truffle-mri-tests' do

plugin :antrun do
execute_goals('run',
:id => 'rake',
:phase => 'test',
:configuration => [xml(
'<target>' +
'<exec dir="${jruby.home}" executable="ruby" failonerror="true">' +
'<arg value="tool/jt.rb" />' +
'<arg value="test" />' +
'<arg value="mri" />' +
'</exec>' +
'</target>')])
end

end

end
28 changes: 28 additions & 0 deletions test/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1020,5 +1020,33 @@
</plugins>
</build>
</profile>
<profile>
<id>truffle-mri-tests</id>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>rake</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<exec dir="${jruby.home}" executable="ruby" failonerror="true">
<arg value="tool/jt.rb" />
<arg value="test" />
<arg value="mri" />
</exec>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>