components/erlang/patches/test-ordering.patch
author Rich Burridge <rich.burridge@oracle.com>
Mon, 11 May 2015 05:48:43 -0700
branchs11u2-sru
changeset 4269 17ea514d2fe0
permissions -rw-r--r--
20785395 problem in UTILITY/ERLANG 20823713 We should update erlang to version 17.5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4269
17ea514d2fe0 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
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
therefore generate test results that we can successfully compare
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
against a master test results file.
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
17ea514d2fe0 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:
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
17ea514d2fe0 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
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
  * WARNING: Future backward-incompatibility!
17ea514d2fe0 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
17ea514d2fe0 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
17ea514d2fe0 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
17ea514d2fe0 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
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
    require sorted results from wildcard expansions, use the $(sort ...)
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
    function to request it explicitly.
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
 
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
This change will be passed upstream.
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
17ea514d2fe0 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
17ea514d2fe0 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
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
@@ -987,7 +987,7 @@
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
 
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
 TEST_DIRS := \
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
 	lib/test_server \
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
-	$(wildcard lib/*/test) \
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
+	$(sort $(wildcard lib/*/test)) \
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    27
 	erts/test \
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    28
 	erts/epmd/test \
17ea514d2fe0 20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    29
 	erts/emulator/test