--- gforth/testdist	1996/10/31 17:41:17	1.1
+++ gforth/testdist	2003/08/22 08:08:46	1.14
@@ -1,22 +1,41 @@
+#! /bin/sh
 #tests that dist works
-#call this with gforth-$(version).tar.gz in the working directory
-GFORTH=gforth-0.2.0
-mkdir test
-cd test
-DIR=$PWD
-gunzip -cd ../$GFORTH.tar.gz|tar xf -
-chmod -R a-w $GFORTH
-mkdir build
-cd build
-../$GFORTH/configure --prefix=$DIR/install
-make
-make check
+#usage: testdist gforth-version.tar.gz
+#gforth-version.tar.gz must be in the working directory
+MACHINE=`hostname`
+GFORTH=`basename $1 .tar.gz`
+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
+then
+	echo building in build
+	chmod -R a-w $GFORTH
+	rm -rf build
+	mkdir build
+	cd build
+	../$GFORTH/configure --prefix=$DIR/install
+else
+	echo building in $GFORTH
+	cd $GFORTH
+	./configure --prefix=$DIR/install
+fi &&
+make &&
+make check &&
 #gforth locals-test.fs
 #gforth test-counted-loops.fs
-make install
-make bench
-cd ..
-install/bin/gforth tester.fs coretest.fs postponetest.fs dbltest.fs -e bye
+make install &&
+#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 &&
+cd ../vmgen-ex2 &&
+PATH=$DIR/install/bin:$PATH make check GCC="$CC -O" YACC=yacc &&
+cd .. &&
+cd .. &&
+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 ..
-rm -rf test