From: Alex Smith <ais523@bham.ac.uk>
Date: Tue, 31 Aug 2010 09:11:50 +0000 (+0100)
Subject: Merge branch 'master' of git://gitorious.org/intercal/intercal
X-Git-Tag: 0.29~79
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=a25032e741d8ada48226ede82b979ac73e182ebf;p=intercal.git

Merge branch 'master' of git://gitorious.org/intercal/intercal

Conflicts:
	pit/Makefile
---

a25032e741d8ada48226ede82b979ac73e182ebf
diff --cc pit/Makefile
index 2cea8bd,da841ea..5c21c74
--- a/pit/Makefile
+++ b/pit/Makefile
@@@ -109,7 -116,9 +116,9 @@@ test: $(TARGETS
  	@cat sort.tst | ./sort | ./regresscheck sort
  	@cat tpk.tst | ./tpk | ./regresscheck tpk
  	@cat unlambda.tst | ./unlambda | ./regresscheck unlambda
 -	@cat yapp.tst | yapp >yapptest.i && $(ICK) yapptest.i && yapptest | regresscheck -c yapp.tst yapp; rm -f yapptest.i yapptest
 +	@cat yapp.tst | ./yapp >yapptest.i && $(ICK) yapptest.i && ./yapptest | ./regresscheck -c yapp.tst yapp; rm -f yapptest.i yapptest
+ 	@cat tests/ais1.tst | ./tests/ais1 | ./regresscheck tests/ais1 
+ 	@cat tests/ais2.tst | ./tests/ais2 | ./regresscheck tests/ais2 
  	@./tests/count | ./regresscheck tests/count 
  	@./tests/hello | ./regresscheck tests/hello 
  	@./tests/ignorret | ./regresscheck tests/ignorret