diff options
| author | Colin Walters <walters@verbum.org> | 2009-08-17 07:46:22 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-08-17 07:46:22 -0400 |
| commit | a1b7488c718cb6a26d1152885d8fbe1e0abb9895 (patch) | |
| tree | b5aa123d062ddc27921dd0b9a726123598e317bd | |
| parent | ec1af4caa11788442b3b1ffae3d36bc7f53b52b8 (diff) | |
| download | gobject-introspection-a1b7488c718cb6a26d1152885d8fbe1e0abb9895.tar.gz | |
Bug 592055 - Build/test fixes
The last few commits regressed 'check'; fix those up.
| -rw-r--r-- | giscanner/dumper.py | 2 | ||||
| -rw-r--r-- | giscanner/girwriter.py | 2 | ||||
| -rw-r--r-- | giscanner/transformer.py | 3 | ||||
| -rw-r--r-- | giscanner/utils.py | 3 | ||||
| -rw-r--r-- | tests/offsets/Makefile.am | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/giscanner/dumper.py b/giscanner/dumper.py index adfe88bc..0637e5cf 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -94,8 +94,6 @@ class DumpCompiler(object): # Public API def run(self): - print ' GEN ' + (self._options.output and - self._options.output or '<stdout>') c_path = self._generate_tempfile('.c') f = open(c_path, 'w') f.write(_PROGRAM_TEMPLATE) diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index aad55ef1..7725a38d 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -21,8 +21,6 @@ from __future__ import with_statement -import os - from .ast import (Alias, Array, Bitfield, Callback, Class, Constant, Enum, Function, Interface, List, Map, Member, Struct, Union, Varargs) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 10d88dfe..bacdfab7 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -501,7 +501,8 @@ class Transformer(object): def _create_const(self, symbol): # Don't create constants for non-public things # http://bugzilla.gnome.org/show_bug.cgi?id=572790 - if symbol.source_filename is None or not symbol.source_filename.endswith('.h'): + if (symbol.source_filename is None or + not symbol.source_filename.endswith('.h')): return None name = self.remove_prefix(symbol.ident) if symbol.const_string is not None: diff --git a/giscanner/utils.py b/giscanner/utils.py index 29a55609..00d7a885 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py @@ -95,7 +95,8 @@ def get_libtool_command(options): return libtool_path.split(' ') try: - subprocess.check_call(['libtool', '--version']) + subprocess.check_call(['libtool', '--version'], + stdout=open(os.devnull)) except subprocess.CalledProcessError, e: # If libtool's not installed, assume we don't need it return None diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am index c725bbc0..e27bedbe 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -54,7 +54,7 @@ CLEANFILES += gitestoffsets.c check-local: offsets-1.0.typelib LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \ - GI_TYPELIB_PATH=:$(top_builddir)/gir gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected + GI_TYPELIB_PATH=:$(top_builddir)/gir ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected diff -u offsets.compiled offsets.introspected CLEANFILES += offsets.compiled offsets.introspected |