kerneltest/e32test/defrag/t_ramdefrag.cpp
changeset 201 43365a9b78a3
parent 152 657f875b013e
child 229 07a685bbdd3d
child 247 d8d70de2bd36
--- a/kerneltest/e32test/defrag/t_ramdefrag.cpp	Wed Jun 23 19:44:53 2010 +0300
+++ b/kerneltest/e32test/defrag/t_ramdefrag.cpp	Tue Jul 06 15:50:07 2010 +0300
@@ -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;
 				}