Skip to content

Commit dad3355

Browse files
authored
Upgrade Ubuntu tasks Evergreen (#796)
* CDRIVER-3912 Run OCSP tests against Ubuntu 20.04 * CDRIVER-3946 Run Evg tasks on Ubuntu 18.04 and RHEL 8.1 (power8) * CDRIVER-4022 Skip invalid_wc_server_error test on mongos
1 parent 058a1b9 commit dad3355

File tree

5 files changed

+270
-103
lines changed

5 files changed

+270
-103
lines changed

.evergreen/compile-unix.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ case "$MARCH" in
162162
i386)
163163
CFLAGS="$CFLAGS -m32 -march=i386"
164164
CXXFLAGS="$CXXFLAGS -m32 -march=i386"
165-
CONFIGURE_FLAGS="$CONFIGURE_FLAGS -DENABLE_SNAPPY=AUTO -DENABLE_ZLIB=BUNDLED"
165+
CONFIGURE_FLAGS="$CONFIGURE_FLAGS -DENABLE_SNAPPY=AUTO -DENABLE_ZLIB=BUNDLED -DENABLE_ZSTD=OFF"
166166
;;
167167
s390x)
168168
CFLAGS="$CFLAGS -march=z196 -mtune=zEC12"
@@ -229,10 +229,18 @@ fi
229229
if [ "$ANALYZE" = "ON" ]; then
230230
# Clang static analyzer, available on Ubuntu 16.04 images.
231231
# https://clang-analyzer.llvm.org/scan-build.html
232-
scan-build $CMAKE $CONFIGURE_FLAGS .
232+
#
233+
# On images other than Ubuntu 16.04, use scan-build-3.9 if
234+
# scan-build is not found.
235+
if command -v scan-build 2>/dev/null; then
236+
SCAN_BUILD_COMMAND="scan-build"
237+
else
238+
SCAN_BUILD_COMMAND="scan-build-3.9"
239+
fi
240+
$SCAN_BUILD_COMMAND $CMAKE $CONFIGURE_FLAGS .
233241

234242
# Put clang static analyzer results in scan/ and fail build if warnings found.
235-
SCAN_BUILD="scan-build -o scan --status-bugs"
243+
SCAN_BUILD="$SCAN_BUILD_COMMAND -o scan --status-bugs"
236244
else
237245
$CMAKE $CONFIGURE_FLAGS .
238246
fi

0 commit comments

Comments
 (0)