summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/test_connlabel.c8
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 20ebaf2..16fbe6a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,10 @@ include $(top_srcdir)/Make_global.am
check_PROGRAMS = test_api test_filter test_connlabel ct_stress \
ct_events_reliable
+EXTRA_DIST = qa-connlabel.conf
+
+TESTS = test_api test_filter test_connlabel
+
test_api_SOURCES = test_api.c
test_api_LDADD = ../src/libnetfilter_conntrack.la
diff --git a/tests/test_connlabel.c b/tests/test_connlabel.c
index 99b1171..f6f222b 100644
--- a/tests/test_connlabel.c
+++ b/tests/test_connlabel.c
@@ -1,4 +1,5 @@
#include <assert.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
@@ -60,6 +61,13 @@ int main(void)
l = nfct_labelmap_new("qa-connlabel.conf");
if (!l)
l = nfct_labelmap_new("tests/qa-connlabel.conf");
+ if (!l) {
+ char testconf[PATH_MAX];
+
+ snprintf(testconf, PATH_MAX,
+ "%s/qa-connlabel.conf", getenv("srcdir"));
+ l = nfct_labelmap_new(testconf);
+ }
assert(l);
puts("qa-connlabel.conf:");
dump_map(l);