[DRE-commits] [SCM] ruby-pkg-config.git branch, master, updated. debian/1.1.2_git20110615-2-9-g9b20ef5

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit c00a899a6f6487383822aafcd5e29f3c94c354b3
Merge: 09ea167d12c34eff12329a3d8fb5796a29c4e81a 9de11c2c09a771d4c41e7969faa83a00e81e7735
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Thu Aug 11 10:26:59 2011 -0700

    Merge branch 'upstream'

diff --combined test/test_pkg_config.rb
index 60ac4f8,4cb5834..2268dcd
--- a/test/test_pkg_config.rb
+++ b/test/test_pkg_config.rb
@@@ -17,11 -17,13 +17,13 @@@ class PkgConfigTest < Test::Unit::TestC
    end
  
    def test_cflags
+     omit("this is known bug in 1.1.2") if PKGConfig::VERSION == "1.1.2"
      assert_pkg_config("cairo", ["--cflags"], @cairo.cflags)
      assert_pkg_config("cairo-png", ["--cflags"], @cairo_png.cflags)
    end
  
    def test_cflags_only_I
+     omit("this is known bug in 1.1.2") if PKGConfig::VERSION == "1.1.2"
      assert_pkg_config("cairo", ["--cflags-only-I"], @cairo.cflags_only_I)
      assert_pkg_config("cairo-png", ["--cflags-only-I"], @cairo_png.cflags_only_I)
    end
@@@ -107,10 -109,9 +109,10 @@@
    end
  
    def assert_pkg_config(package, pkg_config_args, actual)
 -    result = pkg_config(package, *pkg_config_args)
 +    result = pkg_config(package, *pkg_config_args).split.sort
 +    sorted_actual = actual.split.sort
      result = nil if result.empty?
 -    assert_equal(result, actual)
 +    assert_equal(result, sorted_actual)
    end
  
    def assert_override_variables(expected, override_variables)

-- 
ruby-pkg-config.git