Merge branch 'master' of github.com:realm/realm-core into release/14.6.0-again

Author: Michael Wilkerson-Barker

evergreen/config.yml

@@ -137,8 +137,8 @@ functions:
               set_cmake_var realm_vars REALM_LLVM_COVERAGE BOOL On
           fi
 
-          set_cmake_var realm_vars REALM_BUILD_COMMANDLINE_TOOLS BOOL On
-          set_cmake_var realm_vars REALM_ENABLE_ENCRYPTION BOOL On
+          set_cmake_var realm_vars REALM_BUILD_COMMANDLINE_TOOLS BOOL "${build_command_line_tools|On}"
+          set_cmake_var realm_vars REALM_ENABLE_ENCRYPTION BOOL "${enable_realm_encryption|On}"
 
           if [[ -n "${fetch_missing_dependencies|}" ]]; then
               set_cmake_var realm_vars REALM_FETCH_MISSING_DEPENDENCIES BOOL On
@@ -1290,6 +1290,31 @@ buildvariants:
   tasks:
   - name: compile_test
 
+- name: ubuntu-small-bpnode-size
+  display_name: "Ubuntu (Small BPNode size)"
+  run_on: ubuntu2204-arm64-large
+  expansions:
+    fetch_missing_dependencies: On
+    c_compiler: "/opt/clang+llvm/bin/clang"
+    cxx_compiler: "/opt/clang+llvm/bin/clang++"
+    extra_flags: -DREALM_MAX_BPNODE_SIZE=4
+    build_command_line_tools: Off
+  tasks:
+  - name: compile_local_tests
+
+- name: ubuntu-no-encryption
+  display_name: "Ubuntu (No encryption support)"
+  run_on: ubuntu2204-arm64-large
+  expansions:
+    fetch_missing_dependencies: On
+    c_compiler: "/opt/clang+llvm/bin/clang"
+    cxx_compiler: "/opt/clang+llvm/bin/clang++"
+    enable_realm_encryption: Off
+    build_command_line_tools: Off
+    disable_tests_against_baas: On
+  tasks:
+  - name: compile_local_tests
+
 - name: ubuntu-encryption-tsan
   display_name: "Ubuntu (Encryption Enabled w/TSAN)"
   run_on: ubuntu2204-arm64-small

src/realm/CMakeLists.txt

@@ -387,7 +387,7 @@ if(REALM_HAVE_BACKTRACE AND NOT CMAKE_GENERATOR STREQUAL Xcode)
     target_link_libraries(Storage PUBLIC ${Backtrace_LIBRARIES})
 endif()
 
-if(REALM_ENABLE_ENCRYPTION AND REALM_HAVE_OPENSSL AND (UNIX OR WIN32))
+if(REALM_HAVE_OPENSSL AND (UNIX OR WIN32))
     target_link_libraries(Storage PUBLIC OpenSSL::Crypto)
 endif()
 

src/realm/util/encrypted_file_mapping.cpp

@@ -20,6 +20,8 @@
 
 #include <realm/util/file_mapper.hpp>
 
+#include <sstream>
+
 #if REALM_ENABLE_ENCRYPTION
 #include <realm/util/aes_cryptor.hpp>
 #include <realm/util/errno.hpp>
@@ -30,7 +32,6 @@
 #include <cstdlib>
 #include <algorithm>
 #include <chrono>
-#include <sstream>
 #include <stdexcept>
 #include <string_view>
 #include <system_error>

test/object-store/sync/metadata.cpp

@@ -59,6 +59,7 @@ std::shared_ptr<Realm> get_metadata_realm()
 using realm::util::adoptCF;
 using realm::util::CFPtr;
 
+#if REALM_ENABLE_ENCRYPTION
 constexpr const char* access_group = "";
 bool can_access_keychain()
 {
@@ -74,6 +75,7 @@ bool can_access_keychain()
     }();
     return can_access_keychain;
 }
+#endif
 
 CFPtr<CFMutableDictionaryRef> build_search_dictionary(CFStringRef account, CFStringRef service)
 {
@@ -607,6 +609,7 @@ TEST_CASE("app metadata: persisted", "[sync][metadata]") {
     }
 }
 
+#if REALM_ENABLE_ENCRYPTION
 TEST_CASE("app metadata: encryption", "[sync][metadata]") {
     test_util::TestDirGuard test_dir(base_path);
 
@@ -732,6 +735,8 @@ TEST_CASE("app metadata: encryption", "[sync][metadata]") {
 #endif // REALM_PLATFORM_APPLE
 }
 
+#endif
+
 #ifndef SWIFT_PACKAGE // The SPM build currently doesn't copy resource files
 TEST_CASE("sync metadata: can open old metadata realms", "[sync][metadata]") {
     test_util::TestDirGuard test_dir(base_path);
@@ -890,7 +895,7 @@ TEST_CASE("sync metadata: can open old metadata realms", "[sync][metadata]") {
 }
 #endif // SWIFT_PACKAGE
 
-#if REALM_PLATFORM_APPLE
+#if REALM_PLATFORM_APPLE && REALM_ENABLE_ENCRYPTION
 TEST_CASE("keychain", "[sync][metadata]") {
     if (!can_access_keychain()) {
         return;

test/test_sync_history_migration.cpp

@@ -48,7 +48,7 @@ using namespace realm::test_util;
 namespace {
 
 #if !REALM_MOBILE
-TEST(Sync_HistoryMigration)
+TEST_IF(Sync_HistoryMigration, REALM_MAX_BPNODE_SIZE == 1000)
 {
     // Set to true to produce new versions of client and server-side files in
     // `resources/history_migration/` as needed. This should be done whenever

test/test_sync_subscriptions.cpp

@@ -399,7 +399,9 @@ TEST(Sync_SubscriptionStoreRefreshSubscriptionSetInvalid)
     CHECK_THROW(latest->refresh(), RuntimeError);
 }
 
-TEST(Sync_SubscriptionStoreInternalSchemaMigration)
+// Only runs if REALM_MAX_BPNODE_SIZE is 1000 since that's what the pre-created
+// test realm files were created with
+TEST_IF(Sync_SubscriptionStoreInternalSchemaMigration, REALM_MAX_BPNODE_SIZE == 1000)
 {
     SHARED_GROUP_TEST_PATH(sub_store_path)