From 52661228b1f219fce0a429654fd1f69c5af76135 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 21 Sep 2012 15:27:58 -0600 Subject: [PATCH] tests: sort preselections to make test failures easier to read Prompted by Stefano Lattarini's report of a test failure due to a missing preselection for automake 1.12. * tests/tools.at (autom4te preselections): Sort before diffing. --- tests/tools.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tools.at b/tests/tools.at index 5a9ee63c..4ffe3da9 100644 --- a/tests/tools.at +++ b/tests/tools.at @@ -1190,7 +1190,7 @@ AT_CHECK([autoconf]) # If this test fails due to missing entries in lib/autom4te.in, then # comparing the old and new requests is a good place to start debugging: -cp autom4te.cache/requests old-requests +sort autom4te.cache/requests >old-requests echo newer >newer $sleep # if `configure' is regenerated, we want it to be strictly newer, # to catch the error consistently. @@ -1198,7 +1198,7 @@ AT_CHECK([aclocal], [], [], [ignore]) AT_CHECK([automake --no-force --add-missing], [], [], [ignore]) AT_CHECK([autoconf]) AT_CHECK([test "`find configure -newer newer`" = "" || - { diff old-requests autom4te.cache/requests; exit 1; }], + { sort autom4te.cache/requests | diff old-requests -; exit 1; }], [], [], [], [extract_version=['s/^[^0-9]*\([0-9][^ ]*\).*/\1/;q'] automake_version=`automake --version | sed "$extract_version"` -- 2.47.2