more 1-by-1 checks for jar-dependencies & jruby-openssl in build.log

enebo · Jul 24, 2015 · 28e0801 · 28e0801
1 parent 9a41cc1
commit 28e0801
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/maven/jruby-dist/src/it/integrity/verify.bsh b/maven/jruby-dist/src/it/integrity/verify.bsh
@@ -33,7 +33,12 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "jar-dependencies,jruby-openssl";
+expected = "jar-dependencies";
+if ( !log.contains( expected ) )
+{
+    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+}
+expected = "jruby-openssl";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby-jars/src/it/integrity/verify.bsh b/maven/jruby-jars/src/it/integrity/verify.bsh
@@ -33,7 +33,12 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "jar-dependencies,jruby-openssl";
+expected = "jar-dependencies";
+if ( !log.contains( expected ) )
+{
+    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+}
+expected = "jruby-openssl";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );