have test 3007 use an exact count

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 0724846..a8a47fa 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -806,7 +806,8 @@ public class MarinaTest {
     private void testRequeueStage0to1to3to0(Marina marina) {
         List<BitVector> dataItems;
 
-        int olc_value = 63;
+        int extras = 5;
+        int olc_value = MORE_THAN_DATA_OUT_SATURATION_AMOUNT + extras;
 
         prln("Begin testRequeueStage0to1to3to0");
        adjustIndent(2);
@@ -847,15 +848,16 @@ public class MarinaTest {
         // verify state3 "OD->ring"
         dataItems = marina.data.drainMany(MORE_THAN_DATA_OUT_SATURATION_AMOUNT);
         fatal(dataItems.size()<MORE_THAN_DATA_OUT_SATURATION_AMOUNT,
-              "Expected an endless supply of data items, but only got: "+dataItems.size()+" of them");
+              "Expected more than " + MORE_THAN_DATA_OUT_SATURATION_AMOUNT +
+              " data items, but only got: "+dataItems.size()+" of them");
 
         // verify state3 "OD->ring"
         saturateInstructionFifo(marina, NOP, MORE_THAN_INSTRUCTION_IN_SATURATION_AMOUNT, true);
 
         // verify state3->state0
-        dataItems = marina.data.drainMany(olc_value);
-        fatal(dataItems.size()>=olc_value,
-              "Expected less than " + olc_value + " items to emerge, but got at least : "+dataItems.size()+" of them");
+        dataItems = marina.data.drainMany(extras + 4);
+        fatal(dataItems.size()!=(extras+1),
+              "Expected exactly " + (extras+1) + " items to emerge, but got at least : "+dataItems.size()+" of them");
 
         // State 0 //////////////////////////////////////////////////////////////////////////////