summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@colm.net>2020-03-21 18:17:48 +0200
committerAdrian Thurston <thurston@colm.net>2020-03-21 18:19:10 +0200
commitd42eba32d731ea16a7aeae1fe381c3e953d66377 (patch)
tree6d30af8c2c477932b1ce6bc33be931849c77d2fe /test
parent0f227e5db320e7b2ec9a69ea19269ec9060091c2 (diff)
downloadcolm-d42eba32d731ea16a7aeae1fe381c3e953d66377.tar.gz
removed version.h from libfsm, updated the dist test
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am4
-rwxr-xr-x[-rw-r--r--]test/dist.sh27
2 files changed, 14 insertions, 17 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 5220fe30..baeb7354 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,3 +11,7 @@ subject.mk: subject.mk.in Makefile
subject.sh: subject.sh.in Makefile
@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
+
+dist: dist.sh
+ @$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
+
diff --git a/test/dist.sh b/test/dist.sh
index 297e9bad..9fbf96b5 100644..100755
--- a/test/dist.sh
+++ b/test/dist.sh
@@ -1,25 +1,18 @@
#!/bin/bash
#
-# Make the dist, build from the dist it, install, then run the test suite
-# against what's been installed.
+set -x
-set -ex
-
-VERSION=`sed -n '/^[ \t]*AC_INIT\>/{ s/.*, *//; s/ *).*//; p }' configure.ac`
-
-rm -Rf colm-suite-${VERSION}.tar.{gz,bz2} colm-suite-${VERSION}
+eval `grep VERSION= config.status`
+DIST=colm-$VERSION.tar.gz
+trap "rm -f $DIST" EXIT
make dist
-tar -zxvf colm-suite-${VERSION}.tar.gz
-
-cd colm-suite-${VERSION}
-
-./configure --prefix=/tmp/colm-suite \
- --with-crack=/home/thurston/pkgs/crack --enable-manual --enable-debug
-
-make
-cd test
+WORKDIR=`mktemp -d /tmp/colm.XXXXXX`
+#trap "rm -Rf $DIST $WORKDIR" EXIT
+tar -C $WORKDIR -xzvf $DIST
-./runtests
+cd $WORKDIR/${DIST%.tar.gz}
+./configure && make -j8
+cd test && ./runtests