Skip to content

Commit

Permalink
Fix SPM compilation errors (#7360)
Browse files Browse the repository at this point in the history
Include paths for the tests are set up slightly different for the SPM build
from the CMake build.
  • Loading branch information
tgoyne authored Feb 21, 2024
1 parent 3cf7aa7 commit b428e83
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions test/object-store/c_api/c_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions test/object-store/realm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b428e83

Please sign in to comment.