X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=d4c1f98c93d745e9ac94ab5be9a02e715e106c23;hp=33deb5048a37b6cd7cf3740a032b964558e01e36;hb=bea819e3a90c7cc18159e43250b3af87602295f8;hpb=60b00d51a5d05ba33ae283577fa5a84899430641

diff --git a/Makefile b/Makefile
index 33deb50..d4c1f98 100644
--- a/Makefile
+++ b/Makefile
@@ -26,61 +26,18 @@ regress:
 	rm edu.berkeley.sbp.jar
 	make test
 
-profile: edu.berkeley.sbp.jar
-	$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
-		-profile -agentlib:yjpagent \
-		tests/meta.g \
-		tests/testcase.g \
-		tests/regression.tc
-
 #-Dsbp.verbose=true
 test: edu.berkeley.sbp.jar
 	$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
-		tests/meta.g \
+		src/edu/berkeley/sbp/meta/meta.g \
 		tests/testcase.g \
 		tests/regression.tc
 
-archscript: edu.berkeley.sbp.jar
-	cd tests; \
-	$(java) -cp ArchSimA3.jar:../$< ArchScript \
-		test.archscript
-
-codebag: edu.berkeley.sbp.jar
-	cd tests; \
-	$(java) -cp ArchSimA3.jar:../$< CodeBagParser \
-		test.fleet
-
-javatest: edu.berkeley.sbp.jar
-	$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
-		tests/meta.g \
-		tests/testcase.g \
-		tests/java.tc
-
-loop: edu.berkeley.sbp.jar
-	$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
-		-graph \
-		tests/meta.g \
-		tests/testcase.g \
-		tests/loop.tc
-
-pain: edu.berkeley.sbp.jar
-	$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
-		-graph \
-		tests/meta.g \
-		tests/testcase.g \
-		tests/pain.tc
-
-ifthen: edu.berkeley.sbp.jar
-	$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
-		tests/meta.g \
-		tests/testcase.g \
-		tests/ifthen.tc
-
 boot: edu.berkeley.sbp.jar
 	cd src; \
 	$(java) -cp ../$< \
 		edu.berkeley.sbp.meta.MetaGrammar \
-		../tests/meta.g \
+		../src/edu/berkeley/sbp/meta/meta.g \
 		edu.berkeley.sbp.meta.MetaGrammar
 
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)