Skip to content
Browse files

Revert "move truffle tests out of the test/pom.rb to avoid installing…

… test gems"

This reverts commit 01d56f3.

Conflicts:
	lib/pom.rb
	lib/pom.xml
	pom.rb
	pom.xml
  • Loading branch information...
1 parent 76c1200 commit d76411e12520758f7162d3b7f753eac598475cde @mkristian mkristian committed Jul 23, 2014
Showing with 25 additions and 56 deletions.
  1. +1 −1 core/pom.rb
  2. +0 −10 lib/pom.rb
  3. +0 −44 lib/pom.xml
  4. +1 −1 pom.rb
  5. +9 −0 pom.xml
  6. +14 −0 test/pom.rb
View
2 core/pom.rb
@@ -42,7 +42,7 @@
jar 'com.github.jnr:jffi:${jffi.version}:native'
jar 'org.jruby.joni:joni:2.1.2-SNAPSHOT'
- jar 'org.jruby.extras:bytelist:1.0.12-SNAPSHOT'
+ jar 'org.jruby.extras:bytelist:1.0.11'
jar 'org.jruby.jcodings:jcodings:1.0.12-SNAPSHOT'
jar 'org.jruby:yecht:1.0'
View
10 lib/pom.rb
@@ -215,14 +215,4 @@ def to_pathname
raise "please remove the obsolete PATCH for krypt in lib/pom.rb"
end
end
-
- profile 'truffle' do
-
- plugin :antrun do
- execute_goals( 'run',
- :id => 'truffle',
- :phase => 'package',
- :configuration => [ xml( '<target><exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true"><arg value="-X+T" /><arg value="-Xtruffle.exceptions.print_java=true" /><arg value="-J-ea" /><arg value="spec/mspec/bin/mspec" /><arg value="run" /><arg value="-t" /><arg value="bin/jruby" /><arg value="-T" /><arg value="-X+T" /><arg value="-T" /><arg value="-Xtruffle.exceptions.print_java=true" /><arg value="-T" /><arg value="-J-ea" /><arg value="--config" /> <arg value="spec/truffle/truffle.mspec" /><arg value="--excl-tag" /><arg value="fails" /></exec></target>' ) ] )
- end
- end
end
View
44 lib/pom.xml
@@ -234,48 +234,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>truffle</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>truffle</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
- <arg value="-X+T" />
- <arg value="-Xtruffle.exceptions.print_java=true" />
- <arg value="-J-ea" />
- <arg value="spec/mspec/bin/mspec" />
- <arg value="run" />
- <arg value="-t" />
- <arg value="bin/jruby" />
- <arg value="-T" />
- <arg value="-X+T" />
- <arg value="-T" />
- <arg value="-Xtruffle.exceptions.print_java=true" />
- <arg value="-T" />
- <arg value="-J-ea" />
- <arg value="--config" />
- <arg value="spec/truffle/truffle.mspec" />
- <arg value="--excl-tag" />
- <arg value="fails" />
- </exec>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
View
2 pom.rb
@@ -169,7 +169,7 @@
end
end
- [ 'rake', 'exec' ].each do |name|
+ [ 'rake', 'exec', 'truffle' ].each do |name|
profile name do
modules [ 'test' ]
View
9 pom.xml
@@ -522,6 +522,15 @@
</modules>
</profile>
<profile>
+ <id>truffle</id>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ </build>
+ <modules>
+ <module>test</module>
+ </modules>
+ </profile>
+ <profile>
<id>bootstrap</id>
<modules>
<module>test</module>
View
14 test/pom.rb
@@ -45,6 +45,9 @@
gem 'rubygems:rspec:${rspec.version}'
gem 'rubygems:minitest:${minitest.version}'
gem 'rubygems:minitest-excludes:${minitest-excludes.version}'
+ gem 'rubygems:rdoc:${rdoc.version}-SNAPSHOT'
+ gem 'rubygems:json:${json.version}'
+ gem 'rubygems:rake:${rake.version}'
overrides do
plugin( 'org.eclipse.m2e:lifecycle-mapping:1.0.0',
@@ -136,4 +139,15 @@
end
+ profile 'truffle' do
+
+ plugin :antrun do
+ execute_goals( 'run',
+ :id => 'rake',
+ :phase => 'validate',
+ :configuration => [ xml( '<target><exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true"><arg value="-X+T" /><arg value="-Xtruffle.exceptions.print_java=true" /><arg value="-J-ea" /><arg value="spec/mspec/bin/mspec" /><arg value="run" /><arg value="-t" /><arg value="bin/jruby" /><arg value="-T" /><arg value="-X+T" /><arg value="-T" /><arg value="-Xtruffle.exceptions.print_java=true" /><arg value="-T" /><arg value="-J-ea" /><arg value="--config" /> <arg value="spec/truffle/truffle.mspec" /><arg value="--excl-tag" /><arg value="fails" /></exec></target>' ) ] )
+ end
+
+ end
+
end

0 comments on commit d76411e

Please sign in to comment.
Something went wrong with that request. Please try again.