mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-22 04:05:39 +00:00
fixed bug causing test script to fail to process command line params
This commit is contained in:
parent
10372c2e13
commit
2398f8f6bf
@ -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
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user