Skip to content

Commit 94fe3dd

Browse files
authored
No need to do duplicate check if current failed testlist is empty (#6691)
Signed-off-by: Sophia Guo <[email protected]>
1 parent bac99d4 commit 94fe3dd

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

buildenv/jenkins/JenkinsfileBase

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,10 +1445,14 @@ def getFailedAndCustomizedTest(String paths="") {
14451445
}
14461446

14471447
def mergeTestCasesWithoutDup(String knownTestCases, String newTestCases) {
1448-
def knownTestCasesList = knownTestCases.split(/\s+/)
1449-
def newTestCasesList = newTestCases.split(/\s+/)
1450-
def filterednewTestCases = newTestCasesList.findAll { !(it in knownTestCasesList) }
1451-
return ( knownTestCases + " " + filterednewTestCases.join(" "))
1448+
if (knownTestCases) {
1449+
def knownTestCasesList = knownTestCases.split(/\s+/)
1450+
def newTestCasesList = newTestCases.split(/\s+/)
1451+
def filterednewTestCases = newTestCasesList.findAll { !(it in knownTestCasesList) }
1452+
return ( knownTestCases + " " + filterednewTestCases.join(" "))
1453+
} else {
1454+
return newTestCases
1455+
}
14521456
}
14531457

14541458
def addFailedTestsGrinderLink(paths="") {
@@ -1466,7 +1470,7 @@ def addFailedTestsGrinderLink(paths="") {
14661470
}
14671471
if ( customizedTestCases != null ) {
14681472
customizedTestCases.each { target, testcases ->
1469-
def tempTestCases = testcases.substring(0, testcases.length() - 1)
1473+
def tempTestCases = testcases
14701474
tempTestCases = URLEncoder.encode(tempTestCases.toString(), "UTF-8")
14711475
def customURL = url.replace(env.FAILED_TEST_TARGET, "TARGET=${target}_custom")
14721476
customURL = customURL.replace(env.CUSTOM_TARGET_KEY_VALUE, "CUSTOM_TARGET=$tempTestCases")

0 commit comments

Comments
 (0)