mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-05-29 06:46:27 +08:00
fixed bug causing test script to fail to process command line params
This commit is contained in:
@@ -241,8 +241,14 @@ def boolean shouldSkipTestTaskCreation(Project subproject) {
|
|||||||
+ " 'excludeFromParallelTests' found.")
|
+ " 'excludeFromParallelTests' found.")
|
||||||
return true
|
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
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -273,8 +279,14 @@ def boolean shouldSkipIntegrationTestTaskCreation(Project subproject) {
|
|||||||
+ "'excludeFromParallelIntegrationTests' found.")
|
+ "'excludeFromParallelIntegrationTests' found.")
|
||||||
return true
|
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
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user