add python tests to DISTFILES and move it to main dir

rspamd · Apr 7, 2013 · 66f69ab · 66f69ab
1 parent 67f8c25
commit 66f69ab
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git 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 → rbldnsd.py b/tests/rbldnsd.py → rbldnsd.py
diff --git a/tests/test_acl.py → test_acl.py b/tests/test_acl.py → test_acl.py
diff --git a/tests/test_btrie.py → test_btrie.py b/tests/test_btrie.py → test_btrie.py
diff --git a/tests/test_ip4trie.py → test_ip4trie.py b/tests/test_ip4trie.py → test_ip4trie.py
diff --git a/tests/test_ip6trie.py → test_ip6trie.py b/tests/test_ip6trie.py → test_ip6trie.py
diff --git a/tests/all_tests.py → tests.py b/tests/all_tests.py → tests.py