Skip to content

Commit

Permalink
Merge pull request #17226 from vsebe/openj9
Browse files Browse the repository at this point in the history
Handle vary compilation error on Windows builds
  • Loading branch information
AdamBrousseau committed Apr 19, 2023
2 parents ea53bde + d062c18 commit f52d032
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
14 changes: 9 additions & 5 deletions buildenv/jenkins/common/build.groovy
Expand Up @@ -803,11 +803,15 @@ def match_fail_pattern(outputLines) {
}

println("Build failure, searching fail pattern in the last ${outputLines.size()} output lines")
Pattern pattern = Pattern.compile(FAIL_PATTERN)
for (line in outputLines) {
Matcher matcher = pattern.matcher(line)
if (matcher.find()) {
return true

for (failPattern in FAIL_PATTERN.tokenize(' ')) {
Pattern pattern = Pattern.compile(failPattern)
for (line in outputLines) {
Matcher matcher = pattern.matcher(line)
if (matcher.find()) {
println("Found ${failPattern} fail pattern!")
return true
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildenv/jenkins/variables/defaults.yml
Expand Up @@ -372,7 +372,7 @@ x86-64_windows:
build: 'ci.role.build && hw.arch.x86 && sw.os.windows'
build_env:
vars: 'PATH+TOOLS=/cygdrive/c/openjdk/LLVM64/bin:/cygdrive/c/openjdk/nasm-2.13.03'
fail_pattern: 'C1083'
fail_pattern: 'C1083 LNK1181 RC1015'
#========================================#
# Windows x86 32bits
#========================================#
Expand All @@ -391,7 +391,7 @@ x86-32_windows:
build_env:
vars:
8: 'PATH+TOOLS=/cygdrive/c/openjdk/LLVM32/bin:/cygdrive/c/openjdk/nasm-2.13.03'
fail_pattern: 'C1083'
fail_pattern: 'C1083 LNK1181 RC1015'
#========================================#
# Mac x86 64bits
#========================================#
Expand Down

0 comments on commit f52d032

Please sign in to comment.