From 2847a6b578a22e0cdb4daa8d0da204fcc30f7945 Mon Sep 17 00:00:00 2001
From: Etienne Petrel <etienne.petrel@mongodb.com>
Date: Mon, 28 Nov 2022 20:45:52 +0000
Subject: Import wiredtiger: a4064c96a7aa29f888af6856703a33fea0bee7f4 from
 branch mongodb-master

ref: 1fe64e0173..a4064c96a7
for: 6.3.0-rc0

WT-9831 Add tests to new variant Amazon Linux 2
---
 src/third_party/wiredtiger/import.data             |  2 +-
 src/third_party/wiredtiger/test/evergreen.yml      | 46 ++++++++++++++++++++++
 .../wiredtiger/test/evergreen/find_cmake.sh        |  6 ++-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index c2316d4919a..d41fb5517fa 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger.git",
     "branch": "mongodb-master",
-    "commit": "1fe64e01738a33b91287416e29ca630cd0de55b3"
+    "commit": "a4064c96a7aa29f888af6856703a33fea0bee7f4"
 }
diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml
index 75ebc903817..f9b9e5945b3 100755
--- a/src/third_party/wiredtiger/test/evergreen.yml
+++ b/src/third_party/wiredtiger/test/evergreen.yml
@@ -5334,3 +5334,49 @@ buildvariants:
     - name: unit-test-nonstandalone
     - name: unit-test-long-nonstandalone
       distros: ubuntu2004-arm64-large
+
+- name: amazon2-arm64
+  display_name: "Amazon Linux 2 ARM64"
+  run_on:
+  - amazon2-arm64-small
+  batchtime: 1440 # 24 hours
+  expansions:
+    configure_env_vars:
+      PATH=/opt/mongodbtoolchain/v3/bin:$PATH
+    test_env_vars:
+      WT_TOPDIR=$(git rev-parse --show-toplevel)
+      WT_BUILDDIR=$WT_TOPDIR/cmake_build
+      LD_LIBRARY_PATH=$WT_BUILDDIR:$WT_TOPDIR/TCMALLOC_LIB/lib
+      LD_PRELOAD=$WT_TOPDIR/TCMALLOC_LIB/lib/libtcmalloc.so
+    CMAKE_INSTALL_PREFIX: -DCMAKE_INSTALL_PREFIX=$(pwd)/cmake_build/LOCAL_INSTALL
+    python_binary: '/opt/mongodbtoolchain/v3/bin/python3'
+    smp_command: -j $(echo "`grep -c ^processor /proc/cpuinfo` * 2" | bc)
+    cmake_generator: "Unix Makefiles"
+    make_command: make
+    CMAKE_PREFIX_PATH: -DCMAKE_PREFIX_PATH="$(pwd)/TCMALLOC_LIB"
+  tasks:
+    - name: compile
+    - name: make-check-test
+    - name: unit-test
+    - name: fops
+    - name: linux-directio
+    - name: checkpoint-filetypes-test
+    - name: unit-test-zstd
+    - name: unit-test-long
+      distros: amazon2-arm64-large
+    - name: spinlock-gcc-test
+    - name: spinlock-pthread-adaptive-test
+    - name: wtperf-test
+    - name: ftruncate-test
+    - name: long-test
+    # FIXME-WT-10212
+    # - name: configure-combinations
+    # FIXME-WT-10214
+    # - name: format-smoke-test
+    # FIXME-WT-10213
+    # - name: tiered-storage-extensions-test
+    - name: compile-nonstandalone
+    - name: make-check-nonstandalone
+    - name: unit-test-nonstandalone
+    - name: unit-test-long-nonstandalone
+      distros: amazon2-arm64-large
diff --git a/src/third_party/wiredtiger/test/evergreen/find_cmake.sh b/src/third_party/wiredtiger/test/evergreen/find_cmake.sh
index 17d40b36a5c..312019cb933 100755
--- a/src/third_party/wiredtiger/test/evergreen/find_cmake.sh
+++ b/src/third_party/wiredtiger/test/evergreen/find_cmake.sh
@@ -12,7 +12,7 @@ CMAKE_VERSION=$CMAKE_MAJOR_VER.$CMAKE_MINOR_VER.$CMAKE_PATCH_VER
 #   https://github.com/mongodb/mongo-c-driver/blob/master/.evergreen/find-cmake.sh
 find_cmake ()
 {
-    if [ ! -z "$CMAKE" ]; then
+    if [ -n "$CMAKE" ]; then
         return 0
     elif [ -f "/Applications/CMake.app/Contents/bin/cmake" ]; then
         CMAKE="/Applications/CMake.app/Contents/bin/cmake"
@@ -20,6 +20,10 @@ find_cmake ()
     elif [ -f "/opt/cmake/bin/cmake" ]; then
         CMAKE="/opt/cmake/bin/cmake"
         CTEST="/opt/cmake/bin/ctest"
+    # Newer package system can be kept separate from the older "cmake".
+    elif [ -f "/usr/bin/cmake3" ]; then
+        CMAKE=/usr/bin/cmake3
+        CTEST=/usr/bin/ctest3
     elif command -v cmake 2>/dev/null; then
         CMAKE=cmake
         CTEST=ctest
-- 
cgit v1.2.1