From 2ad16fa7ac9e951bfd8982835df1e7ea5c9ffb57 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 11 Mar 2019 12:32:44 +0000 Subject: pkg: Make ordering of output from print_package_list() deterministic The iteration order of GHashTable changed in GLib 2.59, which broke the check-print-options test, as it relied on a fixed output order from the --list-all argument to pkg-config. Fix that by making print_package_list() output in alphabetical order by Package.key; and update the test to match. This should work with older and newer versions of GLib. Signed-off-by: Philip Withnall --- check/check-print-options | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'check') diff --git a/check/check-print-options b/check/check-print-options index 198e5a1..b521d4d 100755 --- a/check/check-print-options +++ b/check/check-print-options @@ -35,9 +35,9 @@ RESULT="private-dep >= 1" run_test --print-requires-private requires-test # --list-all, limit to a subdirectory -RESULT="sub1 Subdirectory package 1 - Test package 1 for subdirectory -sub2 Subdirectory package 2 - Test package 2 for subdirectory -broken Broken package - Module with broken .pc file" +RESULT="broken Broken package - Module with broken .pc file +sub1 Subdirectory package 1 - Test package 1 for subdirectory +sub2 Subdirectory package 2 - Test package 2 for subdirectory" PKG_CONFIG_LIBDIR="$srcdir/sub" run_test --list-all # Check handling when multiple incompatible options are set -- cgit v1.2.1