diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | tests/.gitignore (renamed from qa/.gitignore) | 0 | ||||
-rw-r--r-- | tests/Makefile.am (renamed from qa/Makefile.am) | 0 | ||||
-rw-r--r-- | tests/ct_echo_event.c (renamed from qa/ct_echo_event.c) | 0 | ||||
-rwxr-xr-x | tests/ct_echo_event.sh (renamed from qa/ct_echo_event.sh) | 0 | ||||
-rw-r--r-- | tests/ct_events_reliable.c (renamed from qa/ct_events_reliable.c) | 0 | ||||
-rw-r--r-- | tests/ct_mark_filter.c (renamed from qa/ct_mark_filter.c) | 0 | ||||
-rwxr-xr-x | tests/ct_mark_filter.sh (renamed from qa/ct_mark_filter.sh) | 0 | ||||
-rw-r--r-- | tests/ct_stress.c (renamed from qa/ct_stress.c) | 0 | ||||
-rw-r--r-- | tests/inetd.conf (renamed from qa/inetd.conf) | 0 | ||||
-rw-r--r-- | tests/nssocket.c (renamed from qa/nssocket.c) | 0 | ||||
-rw-r--r-- | tests/nssocket.h (renamed from qa/nssocket.h) | 0 | ||||
-rw-r--r-- | tests/nssocket_env.sh (renamed from qa/nssocket_env.sh) | 0 | ||||
-rw-r--r-- | tests/qa-connlabel.conf (renamed from qa/qa-connlabel.conf) | 0 | ||||
-rw-r--r-- | tests/test_api.c (renamed from qa/test_api.c) | 0 | ||||
-rw-r--r-- | tests/test_connlabel.c (renamed from qa/test_connlabel.c) | 2 | ||||
-rw-r--r-- | tests/test_filter.c (renamed from qa/test_filter.c) | 0 |
18 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index baa98ad..1a53c10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Make_global.am ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = include src utils examples qa +SUBDIRS = include src utils examples tests man_MANS = #nfnetlink_conntrack.3 nfnetlink_conntrack.7 diff --git a/configure.ac b/configure.ac index 6304543..6940c38 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3]) AC_CHECK_HEADERS(arpa/inet.h) dnl Check for inet_ntop AC_CHECK_FUNCS(inet_ntop) -dnl Check for setns used in qa +dnl Check for setns used in tests AC_CHECK_FUNCS(setns) dnl Again, some systems have it, but not IPv6 if test "$ac_cv_func_inet_ntop" = "yes" ; then @@ -66,7 +66,7 @@ fi dnl Output the makefile AC_CONFIG_FILES([Makefile src/Makefile include/Makefile utils/Makefile - examples/Makefile qa/Makefile include/libnetfilter_conntrack/Makefile + examples/Makefile tests/Makefile include/libnetfilter_conntrack/Makefile include/internal/Makefile src/conntrack/Makefile src/expect/Makefile libnetfilter_conntrack.pc doxygen.cfg]) AC_OUTPUT diff --git a/qa/.gitignore b/tests/.gitignore index 5e22175..5e22175 100644 --- a/qa/.gitignore +++ b/tests/.gitignore diff --git a/qa/Makefile.am b/tests/Makefile.am index 20ebaf2..20ebaf2 100644 --- a/qa/Makefile.am +++ b/tests/Makefile.am diff --git a/qa/ct_echo_event.c b/tests/ct_echo_event.c index eb9c82f..eb9c82f 100644 --- a/qa/ct_echo_event.c +++ b/tests/ct_echo_event.c diff --git a/qa/ct_echo_event.sh b/tests/ct_echo_event.sh index b4d7409..b4d7409 100755 --- a/qa/ct_echo_event.sh +++ b/tests/ct_echo_event.sh diff --git a/qa/ct_events_reliable.c b/tests/ct_events_reliable.c index b51d0e5..b51d0e5 100644 --- a/qa/ct_events_reliable.c +++ b/tests/ct_events_reliable.c diff --git a/qa/ct_mark_filter.c b/tests/ct_mark_filter.c index cd6dd27..cd6dd27 100644 --- a/qa/ct_mark_filter.c +++ b/tests/ct_mark_filter.c diff --git a/qa/ct_mark_filter.sh b/tests/ct_mark_filter.sh index a2c7fed..a2c7fed 100755 --- a/qa/ct_mark_filter.sh +++ b/tests/ct_mark_filter.sh diff --git a/qa/ct_stress.c b/tests/ct_stress.c index 328409c..328409c 100644 --- a/qa/ct_stress.c +++ b/tests/ct_stress.c diff --git a/qa/inetd.conf b/tests/inetd.conf index 0216b7d..0216b7d 100644 --- a/qa/inetd.conf +++ b/tests/inetd.conf diff --git a/qa/nssocket.c b/tests/nssocket.c index 114938c..114938c 100644 --- a/qa/nssocket.c +++ b/tests/nssocket.c diff --git a/qa/nssocket.h b/tests/nssocket.h index 338ed2f..338ed2f 100644 --- a/qa/nssocket.h +++ b/tests/nssocket.h diff --git a/qa/nssocket_env.sh b/tests/nssocket_env.sh index 1732eb1..1732eb1 100644 --- a/qa/nssocket_env.sh +++ b/tests/nssocket_env.sh diff --git a/qa/qa-connlabel.conf b/tests/qa-connlabel.conf index 38c3115..38c3115 100644 --- a/qa/qa-connlabel.conf +++ b/tests/qa-connlabel.conf diff --git a/qa/test_api.c b/tests/test_api.c index 57fdb90..57fdb90 100644 --- a/qa/test_api.c +++ b/tests/test_api.c diff --git a/qa/test_connlabel.c b/tests/test_connlabel.c index 345ecf6..99b1171 100644 --- a/qa/test_connlabel.c +++ b/tests/test_connlabel.c @@ -59,7 +59,7 @@ int main(void) l = nfct_labelmap_new("qa-connlabel.conf"); if (!l) - l = nfct_labelmap_new("qa/qa-connlabel.conf"); + l = nfct_labelmap_new("tests/qa-connlabel.conf"); assert(l); puts("qa-connlabel.conf:"); dump_map(l); diff --git a/qa/test_filter.c b/tests/test_filter.c index 7877819..7877819 100644 --- a/qa/test_filter.c +++ b/tests/test_filter.c |