diff options
| author | Johan Dahlin <johan@src.gnome.org> | 2006-01-09 13:12:27 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2006-01-09 13:12:27 +0000 |
| commit | b559647ef6cdcfbaa9595c6d73dbea20f7f213c5 (patch) | |
| tree | 20ad393680d9bff1e55c994e861fd4b1341bd428 /tests | |
| parent | 5ad3835c0dfe886ac26f10b509ef9832bb3889d4 (diff) | |
| download | pygtk-b559647ef6cdcfbaa9595c6d73dbea20f7f213c5.tar.gz | |
Remove gobject bindings and depend on pygobject 2.9.0.
Bump version to 2.9.0
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 31 | ||||
| -rw-r--r-- | tests/common.py | 9 | ||||
| -rw-r--r-- | tests/runtests.py | 2 |
3 files changed, 7 insertions, 35 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 15ee4f04..194975b3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,22 +1,11 @@ INCLUDES = \ $(PYTHON_INCLUDES) \ - $(GLIB_CFLAGS) \ + $(PYGOBJECT_FLAGS) \ $(PANGO_CFLAGS) \ $(ATK_CFLAGS) \ - $(GTK_CFLAGS) \ - -I$(top_srcdir)/gobject + $(GTK_CFLAGS) -EXTRA_DIST = $(tests) common.py runtests.py test-thread.h test-unknown.h testmodule.py leak.glade - -noinst_LTLIBRARIES = testhelper.la -linked_LIBS = testhelper.la - -testhelper_la_LDFLAGS = -module -avoid-version -testhelper_la_LIBADD = $(GLIB_LIBS) -testhelper_la_SOURCES = \ - testhelpermodule.c \ - test-thread.c \ - test-unknown.c +EXTRA_DIST = $(tests) common.py runtests.py leak.glade tests = \ test_glade.py \ @@ -24,21 +13,9 @@ tests = \ test_dialog.py \ test_enum.py \ test_gdk.py \ - test_gtype.py \ - test_mainloop.py \ test_radiobutton.py \ - test_properties.py \ - test_signal.py \ - test_subprocess.py \ - test_subtype.py \ test_gdkevent.py \ - test_unknown.py \ - test_textview.py \ - test_source.py - -# This is a hack to make sure a shared library is built -testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES) - $(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS) + test_textview.py check-local: $(top_srcdir)/gtk/__init__.py @if test "$(top_builddir)" != "$(top_srcdir)"; then \ diff --git a/tests/common.py b/tests/common.py index e9704611..af0f648c 100644 --- a/tests/common.py +++ b/tests/common.py @@ -1,6 +1,8 @@ import os import sys +import gobject + def importModules(buildDir, srcDir): # Be very careful when you change this code, it's # fragile and the order is really significant @@ -9,16 +11,11 @@ def importModules(buildDir, srcDir): sys.path.insert(0, srcDir) # atk, pango sys.path.insert(0, buildDir) - # gobject - sys.path.insert(0, os.path.join(buildDir, 'gobject')) # _gtk, keysyms, glade sys.path.insert(0, os.path.join(buildDir, 'gtk')) - # testhelper - sys.path.insert(0, os.path.join(buildDir, 'tests')) sys.argv.append('--g-fatal-warnings') import ltihooks - gobject = importModule('gobject', buildDir, 'gobject/gobject.la') atk = importModule('atk', buildDir) pango = importModule('pango', buildDir) gtk = importModule('gtk', buildDir, 'gtk') @@ -28,8 +25,6 @@ def importModules(buildDir, srcDir): except ImportError: glade = None - testhelper = importModule('testhelper', '.') - ltihooks.uninstall() del ltihooks diff --git a/tests/runtests.py b/tests/runtests.py index 42f6a0c7..3ae71850 100644 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -21,7 +21,7 @@ else: common.importModules(buildDir=buildDir, srcDir=srcDir) -SKIP_FILES = ['common', 'runtests', 'testmodule'] +SKIP_FILES = ['common', 'runtests'] dir = os.path.split(os.path.abspath(__file__))[0] os.chdir(dir) |