add edu.berkeley.sbp.misc.TestAstGenerator

[sbp.git] / Makefile

diff --git a/Makefile b/Makefile
index 33deb50..c3642cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,66 +21,33 @@ demo: edu.berkeley.sbp.jar
 demo2: edu.berkeley.sbp.jar
        $(java) -cp $< edu.berkeley.sbp.misc.Demo2
 
+ast: edu.berkeley.sbp.jar
+       $(java) -cp $< edu.berkeley.sbp.misc.TestAstGenerator tests/math.g
+
 regress:
        make boot
        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 \
+profile: edu.berkeley.sbp.jar
+       $(java) -agentpath:/Applications/YourKit.app/bin/mac/libyjpagent.jnilib -cp $< edu.berkeley.sbp.misc.RegressionTests \
+               -profile \
+               src/edu/berkeley/sbp/meta/meta.g \
                tests/testcase.g \
-               tests/ifthen.tc
+               tests/regression.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)