X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=2c4887ab56a0cfb0bde15df53b053af72f223e23;hb=390ea921b89fd293ecba9f228354f84b9933bebc;hp=959a27d6373b629d553d0f4ef87896a741c78886;hpb=a9f94a821394151a990b875d7ae635448a892ff2;p=fleet.git

diff --git a/Makefile b/Makefile
index 959a27d..2c4887a 100644
--- 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 ####################################################################################