From 7e2bafa4e6da77eb96fbc79573b55dd6a91cc078 Mon Sep 17 00:00:00 2001
From: Billy Dawson <billy.dawson1@ibm.com@macbook-pro-5.hursley.uk.ibm.com>
Date: Thu, 4 Apr 2019 12:08:00 +0100
Subject: [PATCH] Updated script to handle error messages from newer wlp
 versions

---
 server/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/build.gradle b/server/build.gradle
index 2e4ec20..3d1e708 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -409,7 +409,7 @@ task testLarsPackage(type: JavaExec) {
                
     doLast {
         String errorString = errorOutput.toString()
-        if (!(errorString =~ /The directory .*${badDirName} is not a valid installation./)) {
+        if (!((errorString =~ /The directory .*${badDirName} is not a valid installation./) || (errorString =~ /The directory .*${badDirName} is not a valid Liberty install directory./))) {
             throw new GradleException("The expected output from the command was not seen. Actual output was: '${errorString}'"
                 + "\nAnd stdout was: '" + standardOutput + "'")
         }