components/quilt/patches/10-test-ordering.patch
changeset 3888 394d3b52b99a
parent 3887 f1f03630e87f
child 3889 6d2b22b9de00
equal deleted inserted replaced
3887:f1f03630e87f 3888:394d3b52b99a
     1 Fix quilt tests so that they are always done in the same order and
       
     2 therefore generate test results that we can successfully compare
       
     3 against a master test results file.
       
     4 
       
     5 GNU make v3.82 introduced a change that caused this failure:
       
     6 
       
     7   https://lists.gnu.org/archive/html/info-gnu/2010-07/msg00023.html
       
     8 
       
     9   * WARNING: Future backward-incompatibility!
       
    10     Wildcards are not documented as returning sorted values, but up to and
       
    11     including this release the results have been sorted and some makefiles are
       
    12     apparently depending on that.  In the next release of GNU make, for
       
    13     performance reasons, we may remove that sorting.  If your makefiles
       
    14     require sorted results from wildcard expansions, use the $(sort ...)
       
    15     function to request it explicitly.
       
    16 
       
    17 The upstream developers are aware of this problem and provided the suggested
       
    18 change here.
       
    19 
       
    20 --- Makefile.in.orig	2015-01-16 13:06:24.023825051 -0800
       
    21 +++ Makefile.in	2015-01-16 13:07:09.572752077 -0800
       
    22 @@ -119,7 +119,8 @@
       
    23  
       
    24  GIT_DESC :=	$(shell ./git-desc | sed -e 's:^v::')
       
    25  
       
    26 -TESTS :=	$(filter-out test/patch-wrapper.test,$(wildcard test/*.test))
       
    27 +# Tests are sorted to make it easier to compare the results between runs
       
    28 +TESTS :=	$(filter-out test/patch-wrapper.test,$(sort $(wildcard test/*.test)))
       
    29  DIRT +=		test/.depend $(wildcard test/.*.ok)
       
    30  
       
    31  # Settings for running the uninstalled version of quilt in the source tree: