Got make distcheck working by fixing the run_tests.sh.in so that it will work if...

diff --git a/.cvsignore b/.cvsignore
index 45757e9c9f3e9e8ab852d78e076bf3be0e5b4185..1e445e384d0c7fd703cd33ba16e526d55a2a6150 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -36,3 +36,4 @@ version.h
 *.o
 *.spec
 .#*
+run_tests.sh

diff --git a/Makefile.am b/Makefile.am
index 38466db5a3cf8f704c08346a8ff60392801adbe2..413a37cdd056703596d8357af5500541808afb9a 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,5 +48,5 @@ scanner.cc: $(top_srcdir)/scanner.re
 .version:
        echo $(PACKAGE_VERSION) > .version
 
-TESTS = test/run_tests.sh
+TESTS = run_tests.sh
 

diff --git a/configure.in b/configure.in
index ac42ce40e50df09b00ddce32c990467cd2d89c43..3144c1d28c5980b9ddab6bfb139798980737f486 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -47,7 +47,7 @@ README \
 makerpm \
 re2c.1 \
 re2c.spec \
-test/run_tests.sh \
+run_tests.sh \
 ])
-AC_OUTPUT_COMMANDS([chmod +x makerpm test/run_tests.sh])
+AC_OUTPUT_COMMANDS([chmod +x makerpm run_tests.sh])
 AC_OUTPUT

diff --git a/run_tests.sh.in b/run_tests.sh.in
new file mode 100644 (file)
index 0000000..a1166c8
--- /dev/null
+++ b/run_tests.sh.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+mkdir @builddir@/test
+for x in @top_srcdir@/test/*.re; do
+       echo $x
+       # don't use the -o flag, since it makes it harder to diff.
+       outname=@builddir@/test/`basename ${x%.re}.temp`
+       @builddir@/re2c $x | sed -e "s,$x,`basename $x`,g" -e "s,/\* Generated by re2c .*\*/,,g" > $outname
+       if cmp -s ${x%.re}.c $outname; then
+               echo "Passed."
+               rm $outname
+       else
+               echo "Failed: ${x%.re}.c ${x%.re}.temp differ."
+               exit 1
+       fi
+done
+

diff --git a/test/.cvsignore b/test/.cvsignore
index e89b4c13a2c51193a146fb1405cd100ce247bfab..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/test/.cvsignore
+++ b/test/.cvsignore
@@ -1 +0,0 @@
-run_tests.sh

diff --git a/test/run_tests.sh.in b/test/run_tests.sh.in
deleted file mode 100644 (file)
index dd17913..0000000
--- a/test/run_tests.sh.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-for x in @srcdir@/test/*.re; do
-       echo $x
-       # don't use the -o flag, since it makes it harder to diff.
-       @builddir@/re2c $x | sed -e "s,$x,`basename $x`,g" -e "s,/\* Generated by re2c .*\*/,,g" > ${x%.re}.temp
-       if diff ${x%.re}.c ${x%.re}.temp; then
-               echo "Passed."
-               rm ${x%.re}.temp
-       else
-               echo "Failed."
-               exit 1
-       fi
-done
-