summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/third_party/wiredtiger/cmake/third_party/aws_sdk.cmake4
-rw-r--r--src/third_party/wiredtiger/import.data2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/cmake/third_party/aws_sdk.cmake b/src/third_party/wiredtiger/cmake/third_party/aws_sdk.cmake
index adfd6433d64..ceaf19a061c 100644
--- a/src/third_party/wiredtiger/cmake/third_party/aws_sdk.cmake
+++ b/src/third_party/wiredtiger/cmake/third_party/aws_sdk.cmake
@@ -40,6 +40,10 @@ elseif(IMPORT_S3_SDK_EXTERNAL)
-DBUILD_ONLY=s3-crt
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-cpp/install
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+ # ENABLE TESTING decides whether or not to build the AWS CPP SDK with the services integration tests.
+ # Alternatively you can build with testing enabled but set AUTORUN_UNIT_TESTS flag to ON/OFF to decide
+ # whether or not to run the tests. If testing is not enabled, the AUTORUN_UNIT_TESTS flag gets ignored.
+ -DENABLE_TESTING=OFF
BUILD_ALWAYS FALSE
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-cpp/install
BUILD_BYPRODUCTS
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 7d4df026de1..d5636c8a1f8 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": "714e612de553c40c8e4edba4fa00e3f7b419647e"
+ "commit": "64200147ceb744a7854f3278589b589b4a4e774f"
}