From c427b38756cd02d6f36ee1a50023f2cfcda744ec Mon Sep 17 00:00:00 2001
From: Thomas Goyne <tg@realm.io>
Date: Tue, 20 Feb 2024 14:57:42 -0800
Subject: [PATCH] Fix SPM compilation errors

Include paths for the tests are set up slightly different for the SPM build
from the CMake build.
---
 evergreen/config.yml              |  1 +
 test/object-store/c_api/c_api.cpp | 12 ++++++------
 test/object-store/realm.cpp       | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/evergreen/config.yml b/evergreen/config.yml
index 2b578b1703f..06b0db98da6 100644
--- a/evergreen/config.yml
+++ b/evergreen/config.yml
@@ -717,6 +717,7 @@ tasks:
 
 - name: swift-build-and-test
   exec_timeout_secs: 1800
+  tags: [ "for_pull_requests" ]
   commands:
   - func: "fetch source"
   - func: "fetch binaries"
diff --git a/test/object-store/c_api/c_api.cpp b/test/object-store/c_api/c_api.cpp
index d976a05b220..825bbc75a6e 100644
--- a/test/object-store/c_api/c_api.cpp
+++ b/test/object-store/c_api/c_api.cpp
@@ -16,8 +16,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-#include "util/test_file.hpp"
-#include "util/event_loop.hpp"
+#include "../util/test_file.hpp"
+#include "../util/event_loop.hpp"
 
 #include <realm.h>
 
@@ -39,10 +39,10 @@
 #include <fstream>
 
 #if REALM_ENABLE_SYNC
-#include "util/sync/flx_sync_harness.hpp"
-#include "util/sync/sync_test_utils.hpp"
-#include "util/test_path.hpp"
-#include "util/unit_test_transport.hpp"
+#include <util/sync/flx_sync_harness.hpp>
+#include <util/sync/sync_test_utils.hpp>
+#include "../util/test_path.hpp"
+#include "../util/unit_test_transport.hpp"
 
 #include <realm/object-store/sync/app_utils.hpp>
 #include <realm/object-store/sync/sync_user.hpp>
diff --git a/test/object-store/realm.cpp b/test/object-store/realm.cpp
index dd32c6b3fb1..a347839a3e4 100644
--- a/test/object-store/realm.cpp
+++ b/test/object-store/realm.cpp
@@ -16,10 +16,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-#include <util/event_loop.hpp>
-#include <util/test_file.hpp>
-#include <util/test_utils.hpp>
-#include <../util/semaphore.hpp>
+#include "util/event_loop.hpp"
+#include "util/test_file.hpp"
+#include "util/test_utils.hpp"
+#include "../util/semaphore.hpp"
 
 #include <realm/db.hpp>
 #include <realm/history.hpp>
@@ -48,7 +48,7 @@
 
 #include <realm/object-store/sync/async_open_task.hpp>
 #include <realm/object-store/sync/impl/sync_metadata.hpp>
-
+#include <realm/object-store/sync/sync_session.hpp>
 #include <realm/sync/noinst/client_history_impl.hpp>
 #include <realm/sync/subscriptions.hpp>
 #endif