run all tests (including ships directory), add #skip tests where missing

diff --git a/Makefile b/Makefile
index a499f68..7ee8667 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,9 +65,9 @@ upload: fleet.jar build/main.bit
 
 uploadtest:
        make upload
-       $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests
+       $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test ships/*.ship tests
 testmegacz:
-       $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests
+       $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test ships/*.ship tests
 
 build/fabric.v: $(verilog_files) src/edu/berkeley/fleet/slipway/Slipway.java
        make fleet.jar
@@ -104,8 +104,8 @@ manual: fleet.jar
        open .tmp/*.pdf
 
 
-test:     fleet.jar; $(java) -jar fleet.jar             test tests/
-testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test tests/
+test:     fleet.jar; $(java) -jar fleet.jar             test ships/*.ship tests
+testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests
 
 generate: fleet.jar
        $(java) -cp fleet.jar edu.berkeley.fleet.slipway.Generator

diff --git a/ships/Alu1.ship b/ships/Alu1.ship
index c80bafe..a2dcb59 100644 (file)
--- a/ships/Alu1.ship
+++ b/ships/Alu1.ship
@@ -73,6 +73,9 @@ ABS:
     end
   end
 
+== Test ==============================================================================
+#skip
+
 
 == Contributors =========================================================
 Adam Megacz <megacz@cs.berkeley.edu>

diff --git a/ships/Alu2.ship b/ships/Alu2.ship
index 622be27..081b4a5 100644 (file)
--- a/ships/Alu2.ship
+++ b/ships/Alu2.ship
@@ -100,6 +100,9 @@ public void service() {
     end
   end
 
+== Test ==============================================================================
+#skip
+
 
 
 

diff --git a/ships/Alu2b.ship b/ships/Alu2b.ship
index b4dd254..1691b24 100644 (file)
--- a/ships/Alu2b.ship
+++ b/ships/Alu2b.ship
@@ -78,6 +78,9 @@ public void service() {
 
 
 
+== Test ==============================================================================
+#skip
+
 
 == Contributors =========================================================
 Adam Megacz <megacz@cs.berkeley.edu>

diff --git a/ships/Choice.ship b/ships/Choice.ship
index ab5a205..5ea93bb 100644 (file)
--- a/ships/Choice.ship
+++ b/ships/Choice.ship
@@ -208,5 +208,8 @@ public void service() {
 
 
 
+== Test ==============================================================================
+#skip
+
 == Contributors =========================================================
 Adam Megacz <megacz@cs.berkeley.edu>

diff --git a/ships/Execute.ship b/ships/Execute.ship
index 5fd49d0..33cd93a 100644 (file)
--- a/ships/Execute.ship
+++ b/ships/Execute.ship
@@ -61,5 +61,8 @@ module execute (clk, in_r,     in_a_,   in_d,
 endmodule
 
 
+== Test ==============================================================================
+#skip
+
 == Contributors =========================================================
 Adam Megacz <megacz@cs.berkeley.edu>

diff --git a/ships/Halt.ship b/ships/Halt.ship
index fd4f755..debe903 100644 (file)
--- a/ships/Halt.ship
+++ b/ships/Halt.ship
@@ -21,5 +21,9 @@ public void service() {
 == FPGA ==============================================================
 // not implemented FIXME
 
+== Test ==============================================================================
+#skip
+
 == Contributors =========================================================
 Adam Megacz <megacz@cs.berkeley.edu>
+

diff --git a/src/edu/berkeley/fleet/Main.java b/src/edu/berkeley/fleet/Main.java
index 07ab589..c7ebfc0 100644 (file)
--- a/src/edu/berkeley/fleet/Main.java
+++ b/src/edu/berkeley/fleet/Main.java
@@ -73,7 +73,8 @@ public class Main {
             Doc.print();
 
         } else if (command.equals("test")) {
-            test(fleet, new File(args.get(0)));
+            for(int i=0; i<args.size(); i++)
+                test(fleet, new File(args.get(i)));
         } else if (command.equals("asm")) {
             String filename = args.get(0);
             FileOutputStream out = new FileOutputStream("fleet.fo");
@@ -146,7 +147,11 @@ public class Main {
             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))));
-            runTest(fleet, new StringReader(sd.getSection("test")), sd.getName());
+            String testsection = sd.getSection("test");
+            if (testsection != null)
+                runTest(fleet, new StringReader(testsection), sd.getName());
+            else
+                System.out.println("no test for " + sd.getName() + "!");
         }
     }