From efd01fc8cfaec96bd8a65f51d8a224da2f0a9a05 Mon Sep 17 00:00:00 2001 From: nuffer Date: Sun, 13 Mar 2005 01:42:03 +0000 Subject: [PATCH] Got make distcheck working by fixing the run_tests.sh.in so that it will work if the build is in a separate dir and the source dirs are read-only. --- .cvsignore | 1 + Makefile.am | 2 +- configure.in | 4 ++-- run_tests.sh.in | 16 ++++++++++++++++ test/.cvsignore | 1 - test/run_tests.sh.in | 14 -------------- 6 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 run_tests.sh.in delete mode 100644 test/run_tests.sh.in diff --git a/.cvsignore b/.cvsignore index 45757e9c..1e445e38 100644 --- a/.cvsignore +++ b/.cvsignore @@ -36,3 +36,4 @@ version.h *.o *.spec .#* +run_tests.sh diff --git a/Makefile.am b/Makefile.am index 38466db5..413a37cd 100755 --- 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 ac42ce40..3144c1d2 100644 --- 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 index 00000000..a1166c81 --- /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 e89b4c13..e69de29b 100644 --- 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 index dd179133..00000000 --- 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 - -- 2.50.1