Fix object-store-benchmarks build and always build this target (#6999)

* Fix object-store-benchmarks build and always build this target
* Needed to update the target name
* Don't build ObjectStore benchmarks on UWP or Emscripten - We don't have a default scheduler implementation for those platforms
* Update CMakeLists.txt
* Make Object Store benchmarks use the explicit libuv scheduler
* try fix build
* Fix warn_unused_result warning for Android builds
* Fixed some 'duplicate library' warnings
* Updated baas version to latest release
* Updated construction of std::string_view
* Reverted baas commit version due to failures

---------

Co-authored-by: Yavor Georgiev <[email protected]>

Author: Michael Wilkerson-Barker

src/realm/sync/noinst/client_impl_base.cpp

@@ -2523,7 +2523,7 @@ Status Session::receive_query_error_message(int error_code, std::string_view mes
     // because in that case, the associated Realm and SessionWrapper must
     // not be accessed any longer.
     if (m_state == Active) {
-        on_flx_sync_error(query_version, std::string_view(message.data(), message.size())); // throws
+        on_flx_sync_error(query_version, message); // throws
     }
     return Status::OK();
 }

test/CMakeLists.txt

@@ -244,7 +244,8 @@ if(REALM_ENABLE_SYNC)
     set_target_properties(SyncTests PROPERTIES OUTPUT_NAME "realm-sync-tests")
     set_target_resources(SyncTests "${TEST_RESOURCES}")
     enable_stdfilesystem(SyncTests)
-    target_link_libraries(SyncTests Sync SyncServer TestUtil)
+    # Sync lib is included with SyncServer
+    target_link_libraries(SyncTests TestUtil SyncServer)
     add_bundled_test(SyncTests)
 
     if(UNIX AND NOT APPLE)

test/benchmark-sync/CMakeLists.txt

@@ -1,5 +1,6 @@
 if(REALM_ENABLE_SYNC)
     add_executable(realm-benchmark-sync bench_transform.cpp ../test_all.cpp)
     add_dependencies(benchmarks realm-benchmark-sync)
-    target_link_libraries(realm-benchmark-sync TestUtil Sync SyncServer)
+    # Sync lib is included with SyncServer
+    target_link_libraries(realm-benchmark-sync TestUtil SyncServer)
 endif()

test/object-store/CMakeLists.txt

@@ -199,4 +199,7 @@ if(NOT APPLE AND NOT EMSCRIPTEN AND NOT WINDOWS_STORE)
 endif()
 
 add_subdirectory(notifications-fuzzer)
-add_subdirectory(benchmarks)
+
+if(NOT EMSCRIPTEN AND NOT WINDOWS_STORE)
+    add_subdirectory(benchmarks)
+endif()

test/object-store/benchmarks/CMakeLists.txt

@@ -39,15 +39,13 @@ if(REALM_ENABLE_SYNC)
 endif()
 
 target_link_libraries(object-store-benchmarks ObjectStore TestUtil Catch2::Catch2)
-set_target_properties(object-store-benchmarks PROPERTIES
-      EXCLUDE_FROM_ALL 1
-      EXCLUDE_FROM_DEFAULT_BUILD 1)
 
 add_dependencies(benchmarks object-store-benchmarks)
 
 # 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_include_directories(object-store-benchmarks PRIVATE ${libuv_include_dir})
+if(NOT APPLE AND NOT WINDOWS_STORE AND NOT EMSCRIPTEN)
+    # libuv_target is defined in the parent CMakeLists.txt file
     target_link_libraries(object-store-benchmarks ${libuv_target})
+    target_compile_definitions(object-store-benchmarks PRIVATE TEST_SCHEDULER_UV=1)
 endif()

test/object-store/benchmarks/main.cpp

@@ -16,8 +16,11 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-#define CATCH_CONFIG_ENABLE_BENCHMARKING
+#if TEST_SCHEDULER_UV
+#include <realm/object-store/util/uv/scheduler.hpp>
+#endif
 
+#define CATCH_CONFIG_ENABLE_BENCHMARKING
 #include <catch2/catch_all.hpp>
 
 #include <limits.h>
@@ -42,11 +45,17 @@ int main(int argc, char** argv)
     SetCurrentDirectoryA(path);
 #else
     char executable[PATH_MAX];
-    realpath(argv[0], executable);
+    (void)realpath(argv[0], executable);
     const char* directory = dirname(executable);
     chdir(directory);
 #endif
 
+#if TEST_SCHEDULER_UV
+    realm::util::Scheduler::set_default_factory([]() {
+        return std::make_shared<realm::util::UvMainLoopScheduler>();
+    });
+#endif
+
     int result = Catch::Session().run(argc, argv);
     return result < 0xff ? result : 0xff;
 }