--- gforth/testdist	2001/05/01 13:35:42	1.7
+++ gforth/testdist	2003/08/25 08:02:58	1.15
@@ -4,14 +4,16 @@
 #gforth-version.tar.gz must be in the working directory
 MACHINE=`hostname`
 GFORTH=`basename $1 .tar.gz`
-DIR=`pwd`
+DIR=`cygpath -m \`pwd\` 2>/dev/null` || DIR=`pwd`
+test -z "$CC" && CC=cc
 chmod -R +w $GFORTH
 rm -rf $GFORTH
 gunzip -cd $1 | tar xf -
-if make --version|grep -q GNU
+(if make --version|grep -q GNU
 then
 	echo building in build
 	chmod -R a-w $GFORTH
+	rm -rf build
 	mkdir build
 	cd build
 	../$GFORTH/configure --prefix=$DIR/install
@@ -19,17 +21,21 @@ else
 	echo building in $GFORTH
 	cd $GFORTH
 	./configure --prefix=$DIR/install
-fi
+fi &&
 make &&
 make check &&
 #gforth locals-test.fs
 #gforth test-counted-loops.fs
 make install &&
-#make bench
-cd vmgen-ex &&
-PATH=$DIR/install/bin:$PATH make check &&
+#make all-bench &&
+chmod -R +w ../$GFORTH/vmgen-ex ../$GFORTH/vmgen-ex2 &&
+cd ../$GFORTH/vmgen-ex &&
+PATH=$DIR/install/bin:$PATH make check GCC="$CC -O" YACC=yacc LEX=lex &&
+cd ../vmgen-ex2 &&
+PATH=$DIR/install/bin:$PATH make check GCC="$CC -O" YACC=yacc LEX=lex &&
 cd .. &&
 cd .. &&
-install/bin/gforth test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye && echo test ok
+install/bin/gforth test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye &&
+echo test ok )
 chmod -R +w $GFORTH
 cd ..