checkpoint

[sbp.git] / Makefile
diff --git a/Makefile b/Makefile

index 874eaca..da56cde 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
  
-java = java
+java = java -Xmx900m
  
  tibdoc: edu.berkeley.sbp.jar
         $(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
                 tests/tibdoc.g \
-               tests/input.tibdoc
+               tests/bitstream.tib
  
  demo: edu.berkeley.sbp.jar
         $(java) -cp $< edu.berkeley.sbp.misc.Demo \
                 tests/demo.g \
-               tests/demo.in
+               '(11+2*3)-44'
  
  regress:
         make boot
@@ -46,12 +46,32 @@ javatest: edu.berkeley.sbp.jar
                 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.misc.MetaGrammar \
+               edu.berkeley.sbp.meta.MetaGrammar \
                 ../tests/meta.g \
-               edu.berkeley.sbp.misc.MetaGrammar
+               edu.berkeley.sbp.meta.MetaGrammar
  
  edu.berkeley.sbp.jar: $(shell find src -name \*.java)
         mkdir -p bin
@@ -72,3 +92,4 @@ upload:
         darcs dist
         echo '<html><head><meta HTTP-EQUIV="Refresh" CONTENT="0;URL=doc/sbp.html"></head></html>' > index.html
         rsync -are ssh --progress --verbose --delete ./ argus.cs.berkeley.edu:public_html/sbp/
+