Move irc python module tests to libirc/python/tests.

diff --git a/Makefile b/Makefile
index 6e325f7ee6ee08ba59f4f4f36be214efbe9ccc38..73065c241cb8b6db6855ef0d77d45ef5a709db29 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -276,23 +276,24 @@ mods/libpython.so: LDFLAGS+=$(PYTHON_LDFLAGS)
 .PRECIOUS: python/irc.c python/ctrlproxy.c
 
 $(pyirc_objs): CFLAGS+=$(PYTHON_CFLAGS) -fPIC
-python/irc.$(SHLIBEXT): $(pyirc_objs) $(LIBIRC)
-python/irc.$(SHLIBEXT): LDFLAGS+=$(PYTHON_LDFLAGS) $(LIBS)
+libirc/python/irc.$(SHLIBEXT): $(pyirc_objs) $(LIBIRC)
+libirc/python/irc.$(SHLIBEXT): LDFLAGS+=$(PYTHON_LDFLAGS) $(LIBS)
 
 ifeq ($(HAVE_PYTHON),yes)
 all_objs += $(pyirc_objs) mods/python.o python/ctrlproxy.o
 endif
 
-python:: python/irc.$(SHLIBEXT) mods/libpython.$(SHLIBEXT)
+python:: libirc/python/irc.$(SHLIBEXT) mods/libpython.$(SHLIBEXT)
 
-check-python:: python/irc.$(SHLIBEXT)
-       PYTHONPATH=python trial tests.test_irc
+check-python:: libirc/python/irc.$(SHLIBEXT)
+       PYTHONPATH=libirc/python trial tests.test_irc
 
 install-python: all
        $(PYTHON) setup.py install --root="$(DESTDIR)"
 
 clean::
        @rm -f python/tests/*.pyc
+       @rm -f libirc/python/tests/*.pyc
 #      $(PYTHON) setup.py clean
 
 # RFC compliance testing using ircdtorture

diff --git a/libirc/python/tests/__init__.py b/libirc/python/tests/__init__.py
new file mode 100644 (file)
index 0000000..fa7e6c3
--- /dev/null
+++ b/libirc/python/tests/__init__.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2005-2008 Jelmer Vernooij <jelmer@samba.org>
+ 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+

diff --git a/python/tests/test_irc.py b/libirc/python/tests/test_irc.py
similarity index 100%
rename from python/tests/test_irc.py
rename to libirc/python/tests/test_irc.py