From 3aae53e90db07b0cffc979cbb572d7840a05cbc4 Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Thu, 23 Jul 2009 16:48:11 -0700 Subject: [PATCH] MarinaTest: use expectNorthFifoExactly() --- marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 06035b9..f26bf5a 100644 --- a/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java +++ b/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java @@ -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"); -- 1.7.10.4