move graphical sorting demo into SortingDemo, make a command-line sorting regression...

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 959a27d..2c4887a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -225,8 +225,12 @@ synth:
 runserver: fleet.jar
        java -Djava.library.path=lib -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
 
-test:     fleet.jar; $(java) -jar fleet.jar             test ships/*.ship tests
-testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests
+test:     fleet.jar
+       $(java) -jar fleet.jar             test ships/*.ship tests
+       java -cp fleet.jar edu.berkeley.fleet.dataflow.MergeSort interpreter Memory 0 256
+testfpga: fleet.jar
+       $(java) -jar fleet.jar target=fpga test ships/*.ship tests
+       java -cp fleet.jar edu.berkeley.fleet.dataflow.MergeSort fpga Memory 0 256
 
 ## Manual ####################################################################################