author | Rich Burridge <rich.burridge@oracle.com> |
Thu, 07 May 2015 09:03:04 -0700 | |
branch | s11-update |
changeset 4258 | e6c70ecb57e7 |
permissions | -rw-r--r-- |
4258
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Fix erlang tests so that they are always done in the same order and |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
therefore generate test results that we can successfully compare |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
against a master test results file. |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
GNU make v3.82 introduced a change that caused this failure: |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
|
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
https://lists.gnu.org/archive/html/info-gnu/2010-07/msg00023.html |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
|
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
* WARNING: Future backward-incompatibility! |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
Wildcards are not documented as returning sorted values, but up to and |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
including this release the results have been sorted and some makefiles are |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
apparently depending on that. In the next release of GNU make, for |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
performance reasons, we may remove that sorting. If your makefiles |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
require sorted results from wildcard expansions, use the $(sort ...) |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
function to request it explicitly. |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
|
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
This change will be passed upstream. |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
|
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
--- otp_src_17.5/Makefile.in.orig 2015-04-01 17:11:52.717727683 -0700 |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
+++ otp_src_17.5/Makefile.in 2015-04-01 17:12:23.417905229 -0700 |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
@@ -987,7 +987,7 @@ |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
|
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
TEST_DIRS := \ |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
lib/test_server \ |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
- $(wildcard lib/*/test) \ |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
+ $(sort $(wildcard lib/*/test)) \ |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
erts/test \ |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
erts/epmd/test \ |
e6c70ecb57e7
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
erts/emulator/test |