[build] * squashed two integration tests into one

* allow to run single integration test with mvn -Pmain -Dinvoker.test=integrety
jruby · Oct 6, 2014 · 43e158c · 43e158c
1 parent 9ca0507
commit 43e158c
Show file tree

Hide file tree

Showing 23 changed files with 157 additions and 275 deletions.
diff --git a/maven/jruby-complete/src/it/helloworld/invoker.properties b/maven/jruby-complete/src/it/helloworld/invoker.properties
diff --git a/maven/jruby-complete/src/it/helloworld/pom.xml b/maven/jruby-complete/src/it/helloworld/pom.xml
diff --git a/maven/jruby-complete/src/it/helloworld/verify.bsh b/maven/jruby-complete/src/it/helloworld/verify.bsh
diff --git a/maven/jruby-complete/src/it/integrity/pom.xml b/maven/jruby-complete/src/it/integrity/pom.xml
@@ -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>

diff --git a/maven/jruby-complete/src/it/integrity/verify.bsh b/maven/jruby-complete/src/it/integrity/verify.bsh
@@ -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 + "'" );
+}
diff --git a/maven/jruby-dist/src/it/integrity/pom.xml b/maven/jruby-dist/src/it/integrity/pom.xml
@@ -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>

diff --git a/maven/jruby-dist/src/it/integrity/verify.bsh b/maven/jruby-dist/src/it/integrity/verify.bsh
@@ -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 + "'" );
 }
diff --git a/maven/jruby-jars/src/it/helloworld/invoker.properties b/maven/jruby-jars/src/it/helloworld/invoker.properties
diff --git a/maven/jruby-jars/src/it/helloworld/pom.xml b/maven/jruby-jars/src/it/helloworld/pom.xml
diff --git a/maven/jruby-jars/src/it/helloworld/verify.bsh b/maven/jruby-jars/src/it/helloworld/verify.bsh
diff --git a/maven/jruby-jars/src/it/integrity/pom.xml b/maven/jruby-jars/src/it/integrity/pom.xml
@@ -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>

diff --git a/maven/jruby-jars/src/it/integrity/verify.bsh b/maven/jruby-jars/src/it/integrity/verify.bsh
@@ -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 + "'" );
 }
diff --git a/maven/jruby-noasm/src/it/helloworld/invoker.properties b/maven/jruby-noasm/src/it/helloworld/invoker.properties
diff --git a/maven/jruby-noasm/src/it/helloworld/pom.xml b/maven/jruby-noasm/src/it/helloworld/pom.xml
diff --git a/maven/jruby-noasm/src/it/helloworld/verify.bsh b/maven/jruby-noasm/src/it/helloworld/verify.bsh
diff --git a/maven/jruby-noasm/src/it/integrity/pom.xml b/maven/jruby-noasm/src/it/integrity/pom.xml
@@ -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>

diff --git a/maven/jruby-noasm/src/it/integrity/verify.bsh b/maven/jruby-noasm/src/it/integrity/verify.bsh
@@ -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 + "'" );
 }
diff --git a/maven/jruby/src/it/helloworld/invoker.properties b/maven/jruby/src/it/helloworld/invoker.properties