Skip to content

Wrap junit calls in lib function #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Wrap junit calls in lib function #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion zorg/jenkins/jobs/jobs/clang-san-iossim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ pipeline {
post {
always {
script {
junit 'clang-build/**/testresults-*.xunit.xml'
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: "clang-build/**/testresults-*.xunit.xml"
])
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion zorg/jenkins/jobs/jobs/clang-stage1-RA
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,10 @@ pipeline {
post {
always {
script {
junit "clang-build/**/testresults.xunit.xml"
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: "clang-build/**/testresults.xunit.xml"
])
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion zorg/jenkins/jobs/jobs/clang-stage1-RA-as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,10 @@ pipeline {
post {
always {
script {
junit "clang-build/**/testresults.xunit.xml"
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: "clang-build/**/testresults.xunit.xml"
])
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions zorg/jenkins/jobs/jobs/clang-stage1-RA-expensive
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ pipeline {
// ToDo: Restore the issue scanner
// scanForIssues tool: clang()

junit allowEmptyResults: true, testResults: "clang-build/**/testresults.xunit.xml"
junit allowEmptyResults: true, testResults: "clang-build/asan-IOSSimX86_64Config.xunit.xml"
junit allowEmptyResults: true, testResults: "clang-build/asan-IOSSimI386Config.xunit.xml"
junit allowEmptyResults: true, testResults: "clang-build/tsan-IOSSimX86_64Config.xunit.xml"

sh "rm -rf clang-build clang-install host-compiler *.tar.gz"
def Junit = new org.swift.Junit()
Junit.safeJunit([allowEmptyResults: true, testResults: "clang-build/**/testresults.xunit.xml"])
Junit.safeJunit([allowEmptyResults: true, testResults: "clang-build/asan-IOSSimX86_64Config.xunit.xml"])
Junit.safeJunit([allowEmptyResults: true, testResults: "clang-build/asan-IOSSimI386Config.xunit.xml"])
Junit.safeJunit([allowEmptyResults: true, testResults: "clang-build/tsan-IOSSimX86_64Config.xunit.xml"])
sh "rm -rf clang-build clang-install host-compiler *.tar.gz"
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion zorg/jenkins/jobs/jobs/clang-stage1-cmake-RA-incremental
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ pipeline {
post {
always {
script {
junit "clang-build/**/testresults.xunit.xml"
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: "clang-build/**/testresults.xunit.xml"
])
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion zorg/jenkins/jobs/jobs/clang-stage2-Rthinlto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,10 @@ pipeline {
post {
always {
script {
junit "clang-build/**/testresults.xunit.xml"
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: "clang-build/**/testresults.xunit.xml"
])
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion zorg/jenkins/jobs/jobs/clang-stage2-cmake-RgSan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ pipeline {
post {
always {
script {
junit "clang-build/**/testresults.xunit.xml"
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: "clang-build/**/testresults.xunit.xml"
])
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion zorg/jenkins/jobs/jobs/lldb-cmake-as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,12 @@ pipeline {
always {
// ToDo: Restore the issue scanner
// scanForIssues tool: clang()
junit 'test/results.xml'
script {
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: 'test/results.xml'
])
}
}
}
}
7 changes: 6 additions & 1 deletion zorg/jenkins/jobs/jobs/lldb-cmake-intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,12 @@ pipeline {
always {
// ToDo: Restore the issue scanner
// scanForIssues tool: clang()
junit 'test/results.xml'
script {
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: 'test/results.xml'
])
}
}
}
}
35 changes: 30 additions & 5 deletions zorg/jenkins/jobs/jobs/lldb-cmake-matrix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,12 @@ pipeline {
python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
'''
}
junit 'test/results.xml'
script {
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: 'test/results.xml'
])
}
}
}
stage('Test DWARF4') {
Expand Down Expand Up @@ -174,7 +179,12 @@ pipeline {
python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
'''
}
junit 'test/results.xml'
script {
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: 'test/results.xml'
])
}
}
}
stage('Test DWARF5') {
Expand Down Expand Up @@ -205,7 +215,12 @@ pipeline {
python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
'''
}
junit 'test/results.xml'
script {
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: 'test/results.xml'
])
}
}
}
stage('Build Clang 15.0.1') {
Expand Down Expand Up @@ -272,7 +287,12 @@ pipeline {
python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
'''
}
junit 'test/results.xml'
script {
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: 'test/results.xml'
])
}
}
}
stage('Build Clang 17.0.6') {
Expand Down Expand Up @@ -340,8 +360,13 @@ pipeline {
sleep 120
python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix test || echo "** check-lldb failed with errors"
'''
script {
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: 'test/results.xml'
])
}
}
junit 'test/results.xml'
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion zorg/jenkins/jobs/jobs/lldb-cmake-sanitized
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,12 @@ pipeline {
always {
// ToDo: Restore issue scanner
// scanForIssues tool: clang()
junit 'test/results.xml'
script {
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: 'test/results.xml'
])
}
}
}
}
7 changes: 6 additions & 1 deletion zorg/jenkins/jobs/jobs/llvm-coverage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,12 @@ pipeline {
always {
// ToDo: Restore issue scanner
//scanForIssues tool: clang()
junit 'test/results.xml'
script {
def Junit = new org.swift.Junit()
Junit.safeJunit([
testResults: 'test/results.xml'
])
}
}
success {
script {
Expand Down