X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=marina%2FtestCode%2Fcom%2Fsun%2Fvlsi%2Fchips%2Fmarina%2Ftest%2FMarinaTest.java;h=f26bf5adc7c3032225bb56195d31db82d32d7de2;hb=3aae53e90db07b0cffc979cbb572d7840a05cbc4;hp=6531a915ddb7ba450a869cce41623f958ca93d69;hpb=39482b03a060f579d5eb494b2868d2f430b35409;p=fleet.git

diff --git a/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 6531a91..f26bf5a 100644
--- a/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -980,13 +980,13 @@ public class MarinaTest {
         List<BitVector> dataItems = marina.data.drainMany(num+1);
         fatal(x>num,
               "Expected no more than "+num+
-              " data items to emerge but got at least: "+x);
+              " tokens to emerge but got at least: "+x);
     }
     private void expectTokensExactly(int num) {
         int x = marina.getNumTokens();
         fatal(x!=num,
               "Expected exactly "+num+
-              " data items to emerge but got at least: "+x);
+              " tokens but got at least: "+x);
     }
 
     private void testFlagDRecomputationTime(Marina marina) {
@@ -1102,12 +1102,10 @@ public class MarinaTest {
                 new Instruction.Set(dock,Predicate.IgnoreFlagD,SetDest.InnerLoopCounter,1),
                 SEND_DATA,
             });
-        dataItems = marina.data.drainMany(1);
-        fatal(dataItems.size()!=0, "Expected exactly no data items to emerge but got at least: "+dataItems.size());
-        marina.instrIn.fill(new Instruction.Tail(dock));
 
-        BitVector bv = marina.data.drain();
-        fatal(bv==null, "Expected at least one data item to emerge but got none");
+        expectNorthFifoExactly(0);
+        marina.instrIn.fill(new Instruction.Tail(dock));
+        expectNorthFifoAtLeast(1);
 
         adjustIndent(-2);
         prln("End testHeadWaitsForTail");