From 66f69abb1c26e98b2a351b477665e7874e14ec45 Mon Sep 17 00:00:00 2001
From: Michael Tokarev <mjt@tls.msk.ru>
Date: Sat, 6 Apr 2013 20:56:05 +0400
Subject: [PATCH] add python tests to DISTFILES and move it to main dir

---
 Makefile.in                              | 12 +++++++-----
 tests/rbldnsd.py => rbldnsd.py           |  0
 tests/test_acl.py => test_acl.py         |  0
 tests/test_btrie.py => test_btrie.py     |  0
 tests/test_ip4trie.py => test_ip4trie.py |  0
 tests/test_ip6trie.py => test_ip6trie.py |  0
 tests/all_tests.py => tests.py           |  0
 7 files changed, 7 insertions(+), 5 deletions(-)
 rename tests/rbldnsd.py => rbldnsd.py (100%)
 rename tests/test_acl.py => test_acl.py (100%)
 rename tests/test_btrie.py => test_btrie.py (100%)
 rename tests/test_ip4trie.py => test_ip4trie.py (100%)
 rename tests/test_ip6trie.py => test_ip6trie.py (100%)
 rename tests/all_tests.py => tests.py (100%)

diff --git a/Makefile.in b/Makefile.in
index 7861b60..b47f6c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,14 +67,16 @@ RBLDNSD_OBJS = $(RBLDNSD_SRCS:.c=.o) lib$(NAME).a
 
 MISC = configure configure.lib \
   $(NAME).8 qsort.c Makefile.in dns_maketab.awk $(NAME).spec \
-  NEWS TODO CHANGES-0.81 README.user
+  NEWS TODO CHANGES-0.81 README.user \
+  rbldnsd.py
+TESTS = $(shell test*.py)
 DEBFILES  = debian/changelog debian/copyright debian/rules debian/control \
   debian/postinst debian/$(NAME).default debian/$(NAME).init
 
 SRCS = $(LIB_SRCS) $(RBLDNSD_SRCS)
 GSRC = $(LIB_GSRC)
 HDRS = $(LIB_HDRS) $(RBLDNSD_HDRS)
-DISTFILES = $(SRCS) $(HDRS) $(MISC)
+DISTFILES = $(SRCS) $(HDRS) $(MISC) $(TESTS)
 
 SELF_TESTS = btrie.test
 
@@ -110,7 +112,7 @@ clean:
 	-rm -f $(SELF_TESTS)
 
 distclean: clean
-	-rm -f $(NAME) config.h Makefile config.status tests/*.py[co]
+	-rm -f $(NAME) config.h Makefile config.status *.py[co]
 
 spec:
 	@sed "s/^Version:.*/Version: $(VERSION)/" $(NAME).spec \
@@ -168,8 +170,8 @@ check-selftests: $(SELF_TESTS)
 
 check-python-tests: $(NAME)
 	@echo =============================================================
-	@echo Running tests/all_tests.py
-	@$(PYTHON) tests/all_tests.py
+	@echo Running tests.py
+	@$(PYTHON) tests.py
 
 .SUFFIXES: .test
 
diff --git a/tests/rbldnsd.py b/rbldnsd.py
similarity index 100%
rename from tests/rbldnsd.py
rename to rbldnsd.py
diff --git a/tests/test_acl.py b/test_acl.py
similarity index 100%
rename from tests/test_acl.py
rename to test_acl.py
diff --git a/tests/test_btrie.py b/test_btrie.py
similarity index 100%
rename from tests/test_btrie.py
rename to test_btrie.py
diff --git a/tests/test_ip4trie.py b/test_ip4trie.py
similarity index 100%
rename from tests/test_ip4trie.py
rename to test_ip4trie.py
diff --git a/tests/test_ip6trie.py b/test_ip6trie.py
similarity index 100%
rename from tests/test_ip6trie.py
rename to test_ip6trie.py
diff --git a/tests/all_tests.py b/tests.py
similarity index 100%
rename from tests/all_tests.py
rename to tests.py