MarinaTest: update list of tests to run

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 798dd4e..82dc074 100644 (file)
--- a/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -2212,23 +2212,17 @@ public class MarinaTest {
             switch (testNum) {
                 case 0: {
 
-                    // these tests run fairly quickly
-
-
                     doOneTest(1);       // passes extracted parasitics
                     doOneTest(2);       // passes extracted parasitics
                     doOneTest(3);       // passes extracted parasitics
                     doOneTest(4);       // passes extracted parasitics
                     doOneTest(5);       // passes extracted parasitics
                     doOneTest(6);
-                    doOneTest(1002);
-                    doOneTest(1005);
-                    doOneTest(3019);
-                    doOneTest(3025);
 
                     doOneTest(1000);    // passes extracted parasitics
                     doOneTest(1001);    // passes extracted parasitics
                     doOneTest(1003);    // passes extracted parasitics
+                    doOneTest(1005);
                     doOneTest(3000);    // passes extracted parasitics
                     doOneTest(3001);    // passes extracted parasitics
                     doOneTest(3003);    // passes extracted parasitics
@@ -2248,9 +2242,13 @@ public class MarinaTest {
                     doOneTest(3020);    // passes extracted parasitics
                     doOneTest(3022);    // passes extracted parasitics
                     doOneTest(3023);    // passes extracted parasitics
+                    doOneTest(3025);    // passes extracted parasitics
                     doOneTest(3026);    // passes extracted parasitics
                     doOneTest(3027);    // passes extracted parasitics
                     doOneTest(3028);    // passes extracted parasitics
+                    doOneTest(3029);    // passes extracted parasitics
+                    doOneTest(3030);    // passes extracted parasitics
+                    doOneTest(3031);    // passes extracted parasitics
                     
                     // these tests take a while and usually pass
                     doOneTest(1002);
@@ -2262,6 +2260,7 @@ public class MarinaTest {
                     doOneTest(3021);
                     doOneTest(3024);
                     doOneTest(3025);
+                    doOneTest(3040);
                     
                     // this takes an insanely long time
                     doOneTest(3017);
@@ -2321,6 +2320,11 @@ public class MarinaTest {
                 case 3026: testNonTorpedoableMoveDoesNotResetDFlag(marina);        break; //         23-Apr (+verilog)
                 case 3027: testILCZero(marina);                    break;
                 case 3028: testAbortOutsideOfLoop(marina); break;
+                case 3029: testDFlagWhenTorpedoLyingInWait(marina); break;
+                case 3030: testSetOlcFollowedByDPredicated(marina); break;
+                case 3031: testOverfillTokens(marina); break;
+
+                case 3040: loadEveryValueOLC(marina); break;
 
                 default:
                     fatal(true, "Test number: "+testNum+" doesn't exist.");