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