fix bugs in test-running code

diff --git a/src/edu/berkeley/fleet/Main.java b/src/edu/berkeley/fleet/Main.java
index c7ebfc0..6f35082 100644 (file)
--- a/src/edu/berkeley/fleet/Main.java
+++ b/src/edu/berkeley/fleet/Main.java
@@ -94,6 +94,7 @@ public class Main {
         if (edu.berkeley.fleet.assembler.Parser.skip) {
             System.out.println("\r[" + ANSI.yellow("SKIP") +
                                "] "  + ANSI.yellow(title));
+            edu.berkeley.fleet.assembler.Parser.skip = false;
             return;
         }
         FleetProcess fp = fleet.run(baos.toByteArray());
@@ -143,7 +144,7 @@ public class Main {
             for(String s : f.list())
                 test(fleet, new File(f.getPath() + File.separatorChar + s));
             return;
-        } else if (f.getPath().endsWith(".fleet")) {
+        } else if (f.getPath().endsWith(".fleet") || f.getPath().endsWith(".test")) {
             runTest(fleet, new InputStreamReader(new FileInputStream(f)), f.getPath());
         } else if (f.getPath().endsWith(".ship")) {
             ShipDescription sd = new ShipDescription(f.getName(), new BufferedReader(new InputStreamReader(new FileInputStream(f))));