Properly register libuv scheduler in ObjectStore tests (#6699)

* Properly register libuv scheduler in ObjectStore tests

* remove uv stubs in realm-fuzzer

* changelog

Author: fealebenpae

CHANGELOG.md

@@ -17,6 +17,7 @@
 
 ### Internals
 * Update History Command tool to work with realms with fileformat v23 ([PR #6970](https://github.com/realm/realm-core/pull/6970))
+* Don't edit the ObjectStore target to enable the libuv scheduler in tests, just register the factory instead. ([PR #6699](https://github.com/realm/realm-core/pull/6699))
 
 ----------------------------------------------
 

test/object-store/CMakeLists.txt

@@ -193,10 +193,7 @@ if(NOT APPLE AND NOT EMSCRIPTEN AND NOT WINDOWS_STORE)
     endif()
 
     target_link_libraries(ObjectStoreTests ${libuv_target})
-    # FIXME: ObjectStore itself shouldn't care about this, but we need to refactor scheduler.cpp to make it happen
-    target_compile_definitions(ObjectStore PUBLIC REALM_HAVE_UV=1)
-    get_property(libuv_include_dir TARGET ${libuv_target} PROPERTY INCLUDE_DIRECTORIES)
-    target_include_directories(ObjectStore PRIVATE ${libuv_include_dir})
+    target_compile_definitions(ObjectStoreTests PRIVATE TEST_SCHEDULER_UV=1)
 
     if (MSVC)
         get_target_property(comp_opts ${libuv_target} COMPILE_OPTIONS)

test/object-store/main.cpp

@@ -22,6 +22,10 @@
 #include <realm/util/features.h>
 #include <realm/util/to_string.hpp>
 
+#if TEST_SCHEDULER_UV
+#include <realm/object-store/util/uv/scheduler.hpp>
+#endif
+
 #include <catch2/catch_all.hpp>
 #include <catch2/reporters/catch_reporter_cumulative_base.hpp>
 #include <catch2/catch_test_case_info.hpp>
@@ -72,6 +76,12 @@ int main(int argc, const char** argv)
         }
     }
 
+#if TEST_SCHEDULER_UV
+    realm::util::Scheduler::set_default_factory([]() {
+        return std::make_shared<realm::util::UvMainLoopScheduler>();
+    });
+#endif
+
     Catch::Session session;
     session.useConfigData(config);
     int result = session.run(argc, argv);

test/object-store/util/event_loop.cpp

@@ -26,7 +26,7 @@
 #include <stdexcept>
 #include <vector>
 
-#if REALM_USE_UV
+#if TEST_SCHEDULER_UV
 #include <uv.h>
 #elif REALM_PLATFORM_APPLE
 #include <realm/util/cf_ptr.hpp>
@@ -87,7 +87,7 @@ struct EventLoop::Impl {
     ~Impl();
 
 private:
-#if REALM_USE_UV
+#if TEST_SCHEDULER_UV
     Impl(uv_loop_t* loop);
 
     std::vector<util::UniqueFunction<void()>> m_pending_work;
@@ -132,7 +132,7 @@ void EventLoop::run_pending()
     return m_impl->run_pending();
 }
 
-#if REALM_USE_UV
+#if TEST_SCHEDULER_UV
 
 bool EventLoop::has_implementation()
 {

test/realm-fuzzer/CMakeLists.txt

@@ -32,14 +32,3 @@ if(REALM_LIBFUZZER)
         target_link_libraries(realm-libfuzz TestUtil ObjectStore)
     endif()
 endif()
-
-# on Apple platforms we use the built-in CFRunLoop
-# everywhere else it's libuv, except UWP where it doesn't build
-if(NOT APPLE AND NOT WINDOWS_STORE)
-    target_link_libraries(realm-afl++ uv_a)
-    if(REALM_LIBFUZZER)
-        if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-        target_link_libraries(realm-libfuzz uv_a)
-        endif()
-    endif()
-endif()

test/realm-fuzzer/fuzz_configurator.cpp

@@ -18,6 +18,7 @@
 #include "fuzz_configurator.hpp"
 #include "fuzz_object.hpp"
 #include "../util/test_path.hpp"
+#include <realm/object-store/util/scheduler.hpp>
 
 FuzzConfigurator::FuzzConfigurator(FuzzObject& fuzzer, const std::string& input, bool use_input_file,
                                    const std::string& name)
@@ -34,6 +35,7 @@ void FuzzConfigurator::setup_realm_config()
 {
     m_config.path = m_path;
     m_config.schema_version = 0;
+    m_config.scheduler = realm::util::Scheduler::make_dummy();
     if (m_use_encryption) {
         const char* key = m_fuzzer.get_encryption_key();
         const char* i = key;

test/realm-fuzzer/fuzz_engine.hpp

@@ -25,9 +25,6 @@
 #include <cstring>
 #include <fstream>
 #include <cstdlib>
-#if REALM_USE_UV
-#include <uv.h>
-#endif
 
 class FuzzConfigurator;
 class FuzzEngine {