* Makefile.am configure.in python/Makefile.am python/tests/Makefile.am

  python/tests/basic.py: added first python test script and
  a 'make tests' target
Daniel

diff --git a/ChangeLog b/ChangeLog
index 43b39324ac1e74521b798144ca410278ac2995ed..92ea720287d7cee94cc5905e591562b080156c57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 14 15:29:01 EST 2006 Daniel Veillard <veillard@redhat.com>
+
+       * Makefile.am configure.in python/Makefile.am python/tests/Makefile.am
+         python/tests/basic.py: added first python test script and 
+         a 'make tests' target
+
 Fri Feb 10 16:45:50 CET 2006 Daniel Veillard <veillard@redhat.com>
 
        * libvirt.pc.in: Karel pointed out the name hadn't been updated

diff --git a/Makefile.am b/Makefile.am
index f78084052d650d978fe927dc0ace30a47207aafa..c71ce6e32d4904d2f121f4fdbf3c38a6b4fa3c3b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,3 +11,10 @@ pkgconfig_DATA = libvirt.pc
 
 rpm: clean
        @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
+
+check-local: all tests
+
+tests:
+       @(if [ "@PYTHON_SUBDIR@" != "" ] ; then cd python ; \
+         $(MAKE) MAKEFLAGS+=--silent tests ; fi)
+       

diff --git a/configure.in b/configure.in
index f333e8a6566a08f96e1c0983d34709196a2c320e..6982849ef53e152d89f22d2949fe313288d4fd0f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -193,4 +193,5 @@ cp COPYING.LIB COPYING
 
 AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
           docs/examples/Makefile \
-          libvirt.pc libvirt.spec include/libvirt.h python/Makefile)
+          libvirt.pc libvirt.spec include/libvirt.h \
+         python/Makefile python/tests/Makefile)

diff --git a/python/Makefile.am b/python/Makefile.am
index b0eb78ec252a0e285b08cf38c8b3469335bdeb8f..a31c17da6d028f8844d9c5b608cebe496faf5324 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile for libvirt python library
 
+SUBRIRS= . tests
+
 INCLUDES = \
         -I$(PYTHON_INCLUDES) \
        -I$(top_srcdir)/include \
@@ -60,3 +62,8 @@ $(libvirtmod_la_OBJECTS): $(GENERATED)
 else
 all: 
 endif
+
+dummy:
+
+tests test: all dummy
+       -@(cd tests && $(MAKE) MAKEFLAGS+=--silent tests)

diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
new file mode 100644 (file)
index 0000000..2391bad
--- /dev/null
+++ b/python/tests/Makefile.am
@@ -0,0 +1,30 @@
+EXAMPLE_DIR = $(datadir)/doc/libvirt-python-$(LIBVIRT_VERSION)/examples
+
+PYTESTS=               \
+       basic.py
+
+EXTRA_DIST = $(PYTESTS)
+
+if WITH_PYTHON
+tests: $(PYTESTS)
+       @echo "## running Python regression tests"
+       -@(PYTHONPATH="..:../src/.libs:$(srcdir)/../src:$$PYTHONPATH" ; \
+          export PYTHONPATH; \
+          LD_LIBRARY_PATH="$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH" ; \
+          export LD_LIBRARY_PATH; \
+          for test in $(PYTESTS) ; \
+          do log=`$(PYTHON) $(srcdir)/$$test` ; \
+          if [ "`echo $$log | grep OK`" = "" ] ; then \
+          echo "-- $$test" ; echo "$$log" ; fi ; done)
+else
+tests:
+endif
+
+clean:
+       rm -f *.pyc core
+
+install-data-local:
+       $(mkinstalldirs) $(DESTDIR)$(EXAMPLE_DIR)
+       -(for test in $(PYTESTS); \
+         do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done)
+

diff --git a/python/tests/basic.py b/python/tests/basic.py
new file mode 100755 (executable)
index 0000000..a4ff4c4
--- /dev/null
+++ b/python/tests/basic.py
@@ -0,0 +1,25 @@
+#!/usr/bin/python -u
+import libvirt
+import sys
+
+conn = libvirt.openReadOnly(None)
+if conn == None:
+    print 'Failed to open connection to the hypervisor'
+    sys.exit(1)
+
+# print conn
+
+dom0 = conn.lookupByName("Domain-0")
+if dom0 == None:
+    print 'Failed to find the main domain'
+    sys.exit(1)
+
+# print dom0
+
+print "Domain 0: id %d running %s" % (dom0.ID(), dom0.OSType())
+print dom0.info()
+del dom0
+del conn
+print "OK"
+
+sys.exit(0)