Skip to content

Commit fa4a1d1

Browse files
committed
fixing tests for diff2stat, disabled by default
1 parent ec10a7a commit fa4a1d1

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

source/P4VFS.Core/Include/SettingManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace FileCore {
3131
_N( int32_t, PoolDefaultNumberOfThreads, 8 ) \
3232
_N( int32_t, GarbageCollectPeriodMs, 5*60*1000 ) \
3333
_N( int32_t, DepotClientCacheIdleTimeoutMs, 5*60*1000 ) \
34-
_N( int32_t, MaxDiff2StatFileCount, -1 ) \
34+
_N( int32_t, MaxDiff2StatFileCount, 0 ) \
3535

3636

3737
class SettingManager;

source/P4VFS.Core/Source/DepotOperations.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,12 +1202,12 @@ DepotOperations::Diff2Stat(
12021202
if (useFStat)
12031203
{
12041204
DepotStringArray haveFileSpecs = CreateFileSpecs(depotClient, fileModifications, haveRevision, CreateFileSpecFlags::OverrideRevison);
1205-
DepotResultFStat haveFStat = FStat(depotClient, haveFileSpecs, "", FDepotResultFStatField::DepotFile | FDepotResultFStatField::HeadType);
1205+
DepotResultFStat haveFStat = FStat(depotClient, haveFileSpecs, "", FDepotResultFStatField::DepotFile | FDepotResultFStatField::HeadType | FDepotResultFStatField::HeadRev);
12061206

12071207
DepotStringArray headFileSpecs = CreateFileSpecs(depotClient, fileModifications, nullptr, CreateFileSpecFlags::None);
1208-
DepotResultFStat headFStat = FStat(depotClient, headFileSpecs, "", FDepotResultFStatField::DepotFile | FDepotResultFStatField::HeadType);
1208+
DepotResultFStat headFStat = FStat(depotClient, headFileSpecs, "", FDepotResultFStatField::DepotFile | FDepotResultFStatField::HeadType | FDepotResultFStatField::HeadRev);
12091209

1210-
typedef Map<DepotString, DepotResultTag> Diff2NodeMap;
1210+
typedef Map<DepotString, DepotResultTag, StringInfo::LessInsensitive> Diff2NodeMap;
12111211
Diff2NodeMap nodeMap;
12121212

12131213
auto addNodes = [&nodeMap](const DepotResultFStat& fstat, const DepotString& depotFileName, const DepotString& revName, const DepotString& typeName) -> void

source/P4VFS.Driver/Include/DriverVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#define P4VFS_VER_MAJOR 1 // Increment this number almost never
66
#define P4VFS_VER_MINOR 29 // Increment this number whenever the driver changes
7-
#define P4VFS_VER_BUILD 3 // Increment this number when a major user mode change has been made
7+
#define P4VFS_VER_BUILD 4 // Increment this number when a major user mode change has been made
88
#define P4VFS_VER_REVISION 0 // Increment this number when we rebuild with any change
99

1010
#define P4VFS_VER_STRINGIZE_EX(v) L#v

source/P4VFS.UnitTest/Source/UnitTestBase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ public string ExcludedProcessNames
244244
"SenseCE.exe",
245245
"SenseIR.exe",
246246
"SearchProtocolHost.exe",
247+
"MpDlpService.exe",
247248
});
248249
}
249250
}

0 commit comments

Comments
 (0)