aboutsummaryrefslogtreecommitdiff
path: root/zenserver/projectstore.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-08-20 15:12:04 +0200
committerStefan Boberg <[email protected]>2021-08-20 15:12:04 +0200
commit6657fefe66e4b06f5d46a5f6c2c24c81f56ece90 (patch)
treea25a58e7c1ad2de43a4f1f24cbbbfe2dd53f648d /zenserver/projectstore.cpp
parentMerge branch 'main' of https://github.com/EpicGames/zen into main (diff)
downloadzen-6657fefe66e4b06f5d46a5f6c2c24c81f56ece90.tar.xz
zen-6657fefe66e4b06f5d46a5f6c2c24c81f56ece90.zip
Added logic to fix project store tests (we use absolute file paths in the test, unlike the cooker)
Diffstat (limited to 'zenserver/projectstore.cpp')
-rw-r--r--zenserver/projectstore.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp
index 534983347..90ff79b30 100644
--- a/zenserver/projectstore.cpp
+++ b/zenserver/projectstore.cpp
@@ -406,7 +406,12 @@ ProjectStore::Oplog::AddFileMapping(Oid FileId, IoHash Hash, std::string_view Se
if (ServerPath[0] == '/' || ClientPath[0] != '/')
{
- return false;
+ // This is a special case just to enable tests to use absolute paths. We might want
+ // to have configuration to control this
+ if (ServerPath[1] != ':')
+ {
+ return false;
+ }
}
FileMapEntry Entry;