Bug 592055 - Build/test fixes

The last few commits regressed 'check'; fix those up.

diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index adfe88bcf9437473bea2af88035bdfc1626033bd..0637e5cfac56c4fa2234a47686d4c354894ee84a 100644 (file)
--- 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 aad55ef15ee8cb30dba7ca19b52bed1de18e54fd..7725a38d56c161fb5329cfa9d7470a37a5e3efac 100644 (file)
--- 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 10d88dfebed60996eec776b2773ded8d64367052..bacdfab78d9a02d3fd3579c356e518f1013a77fb 100644 (file)
--- 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 29a5560937402960a8ed614baaf2f54ed4b8a9e8..00d7a8857cd7fe8e6280233112f23ca21b39335c 100644 (file)
--- 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 c725bbc01d070edc04605ba8ae1fcb8e722a4862..e27bedbed0369919e3e79f8c78678a8e7455cf51 100644 (file)
--- 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