summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGustavo J. A. M. Carneiro <gjc@src.gnome.org>2006-07-12 16:48:45 +0000
committerGustavo J. A. M. Carneiro <gjc@src.gnome.org>2006-07-12 16:48:45 +0000
commit250088639a9b99b7238969f73d07d9b79822c233 (patch)
tree57d35efd2e74ca0e61330f803357a31d5a43b4a8 /tests
parent5fa06e844404c5a047c0a94fee6c6e180fae5943 (diff)
downloadpygtk-250088639a9b99b7238969f73d07d9b79822c233.tar.gz
last fixes for 2.9.3 releasePYGTK_2_9_3
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am12
-rw-r--r--tests/common.py4
2 files changed, 10 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a10bdd68..e95c6d7e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,14 +12,18 @@ tests = \
test_style.py \
test_textview.py
+GTK_PY_FILES = __init__.py _lazyutils.py compat.py deprecation.py keysyms.py
+
check-local: $(top_srcdir)/gtk/__init__.py
@if test "$(top_builddir)" != "$(top_srcdir)"; then \
- cp $(top_srcdir)/gtk/__init__.py $(top_builddir)/gtk/__init__.py; \
- cp $(top_srcdir)/gtk/keysyms.py $(top_builddir)/gtk/keysyms.py; \
+ for gtk_py in $(GTK_PY_FILES) ; do \
+ cp $(top_srcdir)/gtk/$${gtk_py} $(top_builddir)/gtk/; \
+ done \
fi
@$(PYTHON) $(srcdir)/runtests.py $(top_builddir) $(top_srcdir)
@if test "$(top_builddir)" != "$(top_srcdir)"; then \
- rm -f $(top_builddir)/gtk/__init__.py*; \
- rm -f $(top_builddir)/gtk/keysyms.py*; \
+ for gtk_py in $(GTK_PY_FILES) ; do \
+ rm -f $(top_builddir)/gtk/$${gtk_py}*; \
+ done \
fi
@rm -fr *.pyc
diff --git a/tests/common.py b/tests/common.py
index 3dbcb71e..1fe35a60 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -54,8 +54,8 @@ def importModule(module, directory, name=None):
try:
obj = __import__(module, {}, {}, fromlist)
- except ImportError:
- print 'WARNING: %s could not be imported' % origName
+ except ImportError, ex:
+ print 'WARNING: %s could not be imported: %s' % (origName, str(ex))
return
if hasattr(obj, '__file__'):