Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[build] * squashed two integration tests into one
Browse files Browse the repository at this point in the history 
        * allow to run single integration test with mvn -Pmain -Dinvoker.test=integrety
@mkristian
mkristian committed Oct 6, 2014
1 parent 9ca0507 commit 43e158c
Showing 23 changed files with 157 additions and 275 deletions.
3 changes: 0 additions & 3 deletions maven/jruby-complete/src/it/helloworld/invoker.properties
View file

This file was deleted.

46 changes: 0 additions & 46 deletions maven/jruby-complete/src/it/helloworld/pom.xml
View file

This file was deleted.

20 changes: 0 additions & 20 deletions maven/jruby-complete/src/it/helloworld/verify.bsh
View file

This file was deleted.

25 changes: 25 additions & 0 deletions maven/jruby-complete/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -106,6 +106,31 @@
</arguments>
</configuration>
</execution>
<execution>
<id>load default gems</id>
<phase>test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<!-- automatically creates the classpath using all project dependencies,
also adding the project build directory -->
<classpath/>
<argument>org.jruby.Main</argument>
<argument>-e</argument>
<!-- make sure openssl loads -->
<argument>
require 'jar-dependencies'
require 'openssl'
require 'krypt'
puts Gem.loaded_specs.keys.sort.join(',')
</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
5 changes: 5 additions & 0 deletions maven/jruby-complete/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -33,3 +33,8 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
23 changes: 23 additions & 0 deletions maven/jruby-dist/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -125,6 +125,29 @@
</arguments>
</configuration>
</execution>
<execution>
<id>load default gems</id>
<phase>test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-Xbootclasspath/a:${jruby.home}/lib/jruby.jar</argument>
<argument>-Djruby.home=${jruby.home}</argument>
<argument>org.jruby.Main</argument>
<argument>-e</argument>
<!-- make sure openssl loads -->
<argument>
require 'jar-dependencies'
require 'openssl'
require 'krypt'
puts Gem.loaded_specs.keys.sort.join(',')
</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
5 changes: 5 additions & 0 deletions maven/jruby-dist/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,11 @@ if ( !log.contains( expected ) )
}
expected = "gems count 9";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
3 changes: 0 additions & 3 deletions maven/jruby-jars/src/it/helloworld/invoker.properties
View file

This file was deleted.

51 changes: 0 additions & 51 deletions maven/jruby-jars/src/it/helloworld/pom.xml
View file

This file was deleted.

20 changes: 0 additions & 20 deletions maven/jruby-jars/src/it/helloworld/verify.bsh
View file

This file was deleted.

23 changes: 23 additions & 0 deletions maven/jruby-jars/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -114,6 +114,29 @@
</arguments>
</configuration>
</execution>
<execution>
<id>load default gems</id>
<phase>test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<argument>${gem.home}/gems/jruby-jars-${ruby.version}/lib/jruby-core-@project.version@.jar${path.separator}${gem.home}/gems/jruby-jars-${ruby.version}/lib/jruby-stdlib-@project.version@.jar</argument>
<argument>org.jruby.Main</argument>
<argument>-e</argument>
<!-- make sure openssl loads -->
<argument>
require 'jar-dependencies'
require 'openssl'
require 'krypt'
puts Gem.loaded_specs.keys.sort.join(',')
</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
5 changes: 5 additions & 0 deletions maven/jruby-jars/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,11 @@ if ( !log.contains( expected ) )
}
expected = "gems count 9";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
3 changes: 0 additions & 3 deletions maven/jruby-noasm/src/it/helloworld/invoker.properties
View file

This file was deleted.

43 changes: 0 additions & 43 deletions maven/jruby-noasm/src/it/helloworld/pom.xml
View file

This file was deleted.

20 changes: 0 additions & 20 deletions maven/jruby-noasm/src/it/helloworld/verify.bsh
View file

This file was deleted.

25 changes: 25 additions & 0 deletions maven/jruby-noasm/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -106,6 +106,31 @@
</arguments>
</configuration>
</execution>
<execution>
<id>load default gems</id>
<phase>test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<!-- automatically creates the classpath using all project dependencies,
also adding the project build directory -->
<classpath/>
<argument>org.jruby.Main</argument>
<argument>-e</argument>
<!-- make sure openssl loads -->
<argument>
require 'jar-dependencies'
require 'openssl'
require 'krypt'
puts Gem.loaded_specs.keys.sort.join(',')
</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
5 changes: 5 additions & 0 deletions maven/jruby-noasm/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,11 @@ if ( !log.contains( expected ) )
}
expected = "gems count 9";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
3 changes: 0 additions & 3 deletions maven/jruby/src/it/helloworld/invoker.properties
View file

This file was deleted.

43 changes: 0 additions & 43 deletions maven/jruby/src/it/helloworld/pom.xml
View file

This file was deleted.

20 changes: 0 additions & 20 deletions maven/jruby/src/it/helloworld/verify.bsh
View file

This file was deleted.

25 changes: 25 additions & 0 deletions maven/jruby/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -106,6 +106,31 @@
</arguments>
</configuration>
</execution>
<execution>
<id>load default gems</id>
<phase>test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<!-- automatically creates the classpath using all project dependencies,
also adding the project build directory -->
<classpath/>
<argument>org.jruby.Main</argument>
<argument>-e</argument>
<!-- make sure openssl loads -->
<argument>
require 'jar-dependencies'
require 'openssl'
require 'krypt'
puts Gem.loaded_specs.keys.sort.join(',')
</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
5 changes: 5 additions & 0 deletions maven/jruby/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,11 @@ if ( !log.contains( expected ) )
}
expected = "gems count 9";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
11 changes: 11 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -514,6 +514,17 @@
</plugins>
</build>
</profile>
<profile>
<id>single invoker test</id>
<activation>
<property>
<name>invoker.test</name>
</property>
</activation>
<properties>
<invoker.skip>false</invoker.skip>
</properties>
</profile>
<profile>
<id>jruby-jars</id>
<modules>

0 comments on commit 43e158c

Please sign in to comment.