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
jruby · Jul 23, 2014 · d76411e · d76411e
1 parent 76c1200
commit d76411e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 56 deletions.
diff --git a/core/pom.rb b/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'
 

diff --git a/lib/pom.rb b/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
diff --git a/lib/pom.xml b/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>
diff --git a/pom.rb b/pom.rb
@@ -169,7 +169,7 @@
     end
   end
 
-  [ 'rake', 'exec' ].each do |name|
+  [ 'rake', 'exec', 'truffle' ].each do |name|
     profile name do
 
       modules [ 'test' ]

diff --git a/pom.xml b/pom.xml
@@ -521,6 +521,15 @@
         <module>test</module>
       </modules>
     </profile>
+    <profile>
+      <id>truffle</id>
+      <build>
+        <defaultGoal>test</defaultGoal>
+      </build>
+      <modules>
+        <module>test</module>
+      </modules>
+    </profile>
     <profile>
       <id>bootstrap</id>
       <modules>

diff --git a/test/pom.rb b/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