- Tweak test system to autodetect win executable when under cygwin

- Move definition of winbuilddir into confiue.in

diff --git a/re2c/Makefile.am b/re2c/Makefile.am
index ab54d2301b8995ae2715723f6315aa9210026136..aeb2712c8da403293d4c62c637e3ec0e800d3fd7 100755 (executable)
--- a/re2c/Makefile.am
+++ b/re2c/Makefile.am
@@ -1,7 +1,5 @@
 # $Id$
 
-WINBUILDDIR = Release-2003
-
 bin_PROGRAMS = re2c
 win_BINARIES = $(WINBUILDDIR)/re2c.exe
 re2c_SOURCES = code.cc dfa.cc main.cc parser.cc actions.cc scanner.re substr.cc\

diff --git a/re2c/configure.in b/re2c/configure.in
index 48e288b00f578965cedc52ad7f92113441ae3578..bb8cccd4f803970e357ecd0e4bc3428b9472a91d 100644 (file)
--- a/re2c/configure.in
+++ b/re2c/configure.in
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT(re2c, 0.13.1.dev, re2c-general@lists.sourceforge.net)
+AC_INIT(re2c, 0.13.2.dev, re2c-general@lists.sourceforge.net)
 AM_INIT_AUTOMAKE(re2c, $PACKAGE_VERSION)
 AC_CONFIG_SRCDIR(actions.cc)
 AM_CONFIG_HEADER(config.h)
@@ -8,6 +8,7 @@ AC_SUBST(PACKAGE_VERSION)
 AC_SUBST(PACKAGE_NAME)
 AC_SUBST(PACKAGE_TARNAME)
 AC_SUBST(PACKAGE_RELEASE, ${PACKAGE_RELEASE:-1})
+AC_SUBST(WINBUILDDIR, Release-2005)
 
 # Checks for programs.
 AC_PROG_YACC

diff --git a/re2c/run_tests.sh.in b/re2c/run_tests.sh.in
index 27a348a257d8d26ff4f9d282dce784e73667a9d1..cef043b95232d1fcfebf0a8dced3a65447d3c4ce 100644 (file)
--- a/re2c/run_tests.sh.in
+++ b/re2c/run_tests.sh.in
@@ -5,6 +5,18 @@ errcnt=0
 tstcnt=0;
 diff -u $0 $0 >/dev/null 2>&1 && diff='diff -u' || diff='diff'
 #diff="${diff} -I '#line [0-9]*'"
+if uname|grep -q -i 'CYGWIN' && test -x "@WINBUILDDIR@/re2c.exe"; then
+re2c='@WINBUILDDIR@/re2c.exe'
+else
+re2c='@builddir@/re2c'
+fi
+echo "Testing: ${re2c}"
+if ${re2c} -v|grep -q 're2c @PACKAGE_VERSION@ *\r*'; then
+echo "Version: @PACKAGE_VERSION@"
+else
+echo "Warning: test build for @PACKAGE_VERSION@ but testing `${re2c} -v`"
+fi
+echo "Diffing: ${diff}"
 if test $# = 0; then
 tests=`for i in test lessons; do find @top_srcdir@/$i -name '*.re'; done|sort`
 else
@@ -22,7 +34,7 @@ for x in $tests; do
        outdiff=@builddir@/test/`basename ${x%.re}.c.diff`
        typname=@builddir@/test/`basename ${x%.re}.h.temp`
        typdiff=@builddir@/test/`basename ${x%.re}.h.diff`
-       @builddir@/re2c $switches $x 2>&1 | sed -e "s,$x,`basename $x`,g" -e "s,/\* Generated by re2c .*\*/,/\* Generated by re2c \*/,g" > $outname
+       $re2c $switches $x 2>&1 | sed -e "s,$x,`basename $x`,g" -e "s,/\* Generated by re2c .*\*/,/\* Generated by re2c \*/,g" > $outname
        if test -n "$genname"; then
                cat $genname | sed -e 's,@builddir@/test/,,g' -e "s,/\* Generated by re2c .*\*/,/\* Generated by re2c \*/,g" > $outname
                rm $genname