Changeset 4306

Timestamp:

11/02/09 17:36:27 (3 weeks ago)

Author:

dr2chase

Message:

Fixed bugs that were breaking cruiseControl

Location:

trunk/ProjectFortress/src/com/sun/fortress

Files:

• compiler/environments/TopLevelEnvGenJUTest.java (modified) (2 diffs)
• tests/unit_tests/SpecDataJUTest.java (modified) (2 diffs)

trunk/ProjectFortress/src/com/sun/fortress/compiler/environments/TopLevelEnvGenJUTest.java

@@ -20 +20 @@
 import com.sun.fortress.Shell;
 import com.sun.fortress.compiler.WellKnownNames;
+import com.sun.fortress.compiler.phases.PhaseOrder;
 import com.sun.fortress.exceptions.StaticError;
 import com.sun.fortress.exceptions.shell.UserError;
@@ -50 +51 @@
     @Override
     protected void setUp() throws Exception {
+        Shell.setPhaseOrder(PhaseOrder.interpreterPhaseOrder);
         Shell.setScala(false);
         fssFiles = new String[4];

trunk/ProjectFortress/src/com/sun/fortress/tests/unit_tests/SpecDataJUTest.java

@@ -17 +17 @@
 package com.sun.fortress.tests.unit_tests;
 
+import com.sun.fortress.Shell;
+import com.sun.fortress.compiler.phases.PhaseOrder;
 import com.sun.fortress.repository.ProjectProperties;
 import junit.framework.Test;
@@ -29 +31 @@
 
     public static Test suite() throws IOException {
+        Shell.setPhaseOrder(PhaseOrder.interpreterPhaseOrder);
+
         String testDir1 = ProjectProperties.FORTRESS_AUTOHOME + "/SpecData/examples/basic";
         String testDir2 = ProjectProperties.FORTRESS_AUTOHOME + "/SpecData/examples/preliminaries";