--- a/kerneltest/e32test/defrag/t_ramdefrag.cpp Wed Jun 23 11:59:44 2010 +0100
+++ b/kerneltest/e32test/defrag/t_ramdefrag.cpp Wed Jun 23 12:52:28 2010 +0100
@@ -1518,7 +1518,7 @@
}
else
{
- if ((allocMov || allocDis) && prevZoneNotFull)
+ if (verifySpread && (allocMov || allocDis) && prevZoneNotFull)
{// The previous least preferable RAM zones were not full so shouldn't
// be any movable or discardable pages in the RAM zones of this preference.
test.Printf(_L("Movable or discardable pages in more preferable RAM zones unnecessarily\n"));
@@ -3053,8 +3053,9 @@
break;
}
totMov -= gZoneUtilArray[zoneIndexCand].iAllocMovable;
- if (gZoneUtilArray[zoneIndexCand].iFreePages != gZoneUtilArray[zoneIndexCand].iPhysPages &&
- gZoneUtilArray[zoneIndexCand].iFreePages != 0)
+ if (gZoneUtilArray[zoneIndexCand].iFreePages &&
+ (gZoneUtilArray[zoneIndexCand].iAllocMovable ||
+ gZoneUtilArray[zoneIndexCand].iAllocDiscardable))
{
zoneNotEmptyOrFull = ETrue;
}