summaryrefslogtreecommitdiff
path: root/test/colm.d
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@colm.net>2019-09-09 14:14:36 -0600
committerAdrian Thurston <thurston@colm.net>2019-09-09 14:14:36 -0600
commit651e173a5924f6602bbd13f25529183ca04c9dc6 (patch)
treeb456e340f0decf9859e4a30f8cfc1aa30739e256 /test/colm.d
parent88e43d6a720e089ab945a1e9fdeca6558e66cd5b (diff)
downloadcolm-651e173a5924f6602bbd13f25529183ca04c9dc6.tar.gz
getting test cases running
Setting up SED_SUBST and the ragel/colm build vars. Previously these were populated by configure options. Now pointing to locations in the same tree.
Diffstat (limited to 'test/colm.d')
-rw-r--r--test/colm.d/Makefile.am4
-rw-r--r--test/colm.d/gentests.sh6
2 files changed, 4 insertions, 6 deletions
diff --git a/test/colm.d/Makefile.am b/test/colm.d/Makefile.am
index a67fc99e..18cca32e 100644
--- a/test/colm.d/Makefile.am
+++ b/test/colm.d/Makefile.am
@@ -1,8 +1,6 @@
noinst_SCRIPTS = gentests subject.mk subject.pl subject.sh
-SED_SUBST = 's/@NO_EFFECT@//'
-
-gentests: gentests.sh Makefile
+entests: gentests.sh Makefile
@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
subject.mk: subject.mk.in Makefile
diff --git a/test/colm.d/gentests.sh b/test/colm.d/gentests.sh
index 817e5ed4..20548561 100644
--- a/test/colm.d/gentests.sh
+++ b/test/colm.d/gentests.sh
@@ -42,9 +42,9 @@
WORKING=working
ERRORS=0
-COLM="@COLM_BIN@"
-CPPFLAGS="@COLM_CPPFLAGS@"
-LDFLAGS="@COLM_LDFLAGS@"
+COLM="../../colm/colm"
+CPPFLAGS="-I../../colm/include"
+LDFLAGS="-L../../colm/.libs -Wl,-rpath,../../colm/.libs"
# Make available to to test directories below us that are not part of this
# repository and cannot source one dir up.