When searching for library tests, 'qa' is easily overlooked. Use a more
common name instead.
Suggested-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Signed-off-by: Phil Sutter <phil@xxxxxx>
---
Changes since v1:
- Add needed changes to configure.ac missed in previous patch.
---
Makefile.am | 2 +-
configure.ac | 4 ++--
{qa => tests}/.gitignore | 0
{qa => tests}/Makefile.am | 0
{qa => tests}/ct_echo_event.c | 0
{qa => tests}/ct_echo_event.sh | 0
{qa => tests}/ct_events_reliable.c | 0
{qa => tests}/ct_mark_filter.c | 0
{qa => tests}/ct_mark_filter.sh | 0
{qa => tests}/ct_stress.c | 0
{qa => tests}/inetd.conf | 0
{qa => tests}/nssocket.c | 0
{qa => tests}/nssocket.h | 0
{qa => tests}/nssocket_env.sh | 0
{qa => tests}/qa-connlabel.conf | 0
{qa => tests}/test_api.c | 0
{qa => tests}/test_connlabel.c | 2 +-
{qa => tests}/test_filter.c | 0
18 files changed, 4 insertions(+), 4 deletions(-)
rename {qa => tests}/.gitignore (100%)
rename {qa => tests}/Makefile.am (100%)
rename {qa => tests}/ct_echo_event.c (100%)
rename {qa => tests}/ct_echo_event.sh (100%)
rename {qa => tests}/ct_events_reliable.c (100%)
rename {qa => tests}/ct_mark_filter.c (100%)
rename {qa => tests}/ct_mark_filter.sh (100%)
rename {qa => tests}/ct_stress.c (100%)
rename {qa => tests}/inetd.conf (100%)
rename {qa => tests}/nssocket.c (100%)
rename {qa => tests}/nssocket.h (100%)
rename {qa => tests}/nssocket_env.sh (100%)
rename {qa => tests}/qa-connlabel.conf (100%)
rename {qa => tests}/test_api.c (100%)
rename {qa => tests}/test_connlabel.c (96%)
rename {qa => tests}/test_filter.c (100%)
diff --git a/Makefile.am b/Makefile.am
index baa98ade1a5ec..1a53c1086a508 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 6304543eca7cd..6940c3894e570 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
similarity index 100%
rename from qa/.gitignore
rename to tests/.gitignore
diff --git a/qa/Makefile.am b/tests/Makefile.am
similarity index 100%
rename from qa/Makefile.am
rename to tests/Makefile.am
diff --git a/qa/ct_echo_event.c b/tests/ct_echo_event.c
similarity index 100%
rename from qa/ct_echo_event.c
rename to tests/ct_echo_event.c
diff --git a/qa/ct_echo_event.sh b/tests/ct_echo_event.sh
similarity index 100%
rename from qa/ct_echo_event.sh
rename to tests/ct_echo_event.sh
diff --git a/qa/ct_events_reliable.c b/tests/ct_events_reliable.c
similarity index 100%
rename from qa/ct_events_reliable.c
rename to tests/ct_events_reliable.c
diff --git a/qa/ct_mark_filter.c b/tests/ct_mark_filter.c
similarity index 100%
rename from qa/ct_mark_filter.c
rename to tests/ct_mark_filter.c
diff --git a/qa/ct_mark_filter.sh b/tests/ct_mark_filter.sh
similarity index 100%
rename from qa/ct_mark_filter.sh
rename to tests/ct_mark_filter.sh
diff --git a/qa/ct_stress.c b/tests/ct_stress.c
similarity index 100%
rename from qa/ct_stress.c
rename to tests/ct_stress.c
diff --git a/qa/inetd.conf b/tests/inetd.conf
similarity index 100%
rename from qa/inetd.conf
rename to tests/inetd.conf
diff --git a/qa/nssocket.c b/tests/nssocket.c
similarity index 100%
rename from qa/nssocket.c
rename to tests/nssocket.c
diff --git a/qa/nssocket.h b/tests/nssocket.h
similarity index 100%
rename from qa/nssocket.h
rename to tests/nssocket.h
diff --git a/qa/nssocket_env.sh b/tests/nssocket_env.sh
similarity index 100%
rename from qa/nssocket_env.sh
rename to tests/nssocket_env.sh
diff --git a/qa/qa-connlabel.conf b/tests/qa-connlabel.conf
similarity index 100%
rename from qa/qa-connlabel.conf
rename to tests/qa-connlabel.conf
diff --git a/qa/test_api.c b/tests/test_api.c
similarity index 100%
rename from qa/test_api.c
rename to tests/test_api.c
diff --git a/qa/test_connlabel.c b/tests/test_connlabel.c
similarity index 96%
rename from qa/test_connlabel.c
rename to tests/test_connlabel.c
index 345ecf608647b..99b1171857db3 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
similarity index 100%
rename from qa/test_filter.c
rename to tests/test_filter.c
--
2.21.0
