This patch contains all the Debian-specific changes mixed together. To review
them separately, please inspect the VCS history at
http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-pkg-config.git;a=summary
--- ruby-pkg-config-1.1.2.orig/test/test_pkg_config.rb
+++ ruby-pkg-config-1.1.2/test/test_pkg_config.rb
@@ -17,13 +17,11 @@ class PkgConfigTest < Test::Unit::TestCa
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
@@ -109,9 +107,10 @@ class PkgConfigTest < Test::Unit::TestCa
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)