From 2398f8f6bf9a73a57806a9fa5e77fcf8e2cd6e3c Mon Sep 17 00:00:00 2001 From: adamopolous Date: Mon, 15 Jul 2019 16:30:08 -0400 Subject: [PATCH] fixed bug causing test script to fail to process command line params --- gradle/support/testUtils.gradle | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gradle/support/testUtils.gradle b/gradle/support/testUtils.gradle index 74b9bc323e..05acab2ed3 100644 --- a/gradle/support/testUtils.gradle +++ b/gradle/support/testUtils.gradle @@ -241,8 +241,14 @@ def boolean shouldSkipTestTaskCreation(Project subproject) { + " 'excludeFromParallelTests' found.") return true } - subproject.ext.repoToTest = subproject.hasProperty('repoToTest') ? subproject.getProperty('repoToTest') : "ALL_REPOS" - if (!repoToTest.equals("ALL_REPOS") && !subproject.getProjectDir().toString().contains("/" + repoToTest + "/")) { + + if (subproject.findProperty("repoToTest")) { + subproject.ext.repoToTest = subproject.getProperty('repoToTest') + } + else { + subproject.ext.repoToTest = "ALL_REPOS" + } + if (!subproject.ext.repoToTest.equals("ALL_REPOS") && !subproject.getProjectDir().toString().contains("/" + repoToTest + "/")) { return true } @@ -273,8 +279,14 @@ def boolean shouldSkipIntegrationTestTaskCreation(Project subproject) { + "'excludeFromParallelIntegrationTests' found.") return true } - subproject.ext.repoToTest = subproject.hasProperty('repoToTest') ? subproject.getProperty('repoToTest') : "ALL_REPOS" - if (!repoToTest.equals("ALL_REPOS") && !subproject.getProjectDir().toString().contains("/" + repoToTest + "/")) { + + if (subproject.findProperty("repoToTest")) { + subproject.ext.repoToTest = subproject.getProperty('repoToTest') + } + else { + subproject.ext.repoToTest = "ALL_REPOS" + } + if (!subproject.ext.repoToTest.equals("ALL_REPOS") && !subproject.getProjectDir().toString().contains("/" + repoToTest + "/")) { return true }