diff options
Diffstat (limited to 'meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch')
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch b/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch index 23329f7927..38725574ba 100644 --- a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch +++ b/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch | |||
@@ -1,18 +1,19 @@ | |||
1 | From 8c0f24404bebffdaf3132d81e2b9560d34ff1677 Mon Sep 17 00:00:00 2001 | 1 | From b28bd61e4716e744617bd681a5b0d5472f62bd67 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Thu, 12 Mar 2020 17:25:45 +0000 | 3 | Date: Thu, 12 Mar 2020 17:25:45 +0000 |
4 | Subject: [PATCH 6/7] autotest-automake-result-format.patch | 4 | Subject: [PATCH] autotest-automake-result-format.patch |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe specific] | 6 | Upstream-Status: Inappropriate [oe specific] |
7 | |||
7 | --- | 8 | --- |
8 | lib/autotest/general.m4 | 39 +++++++++++++++++++++++++++++---------- | 9 | lib/autotest/general.m4 | 39 +++++++++++++++++++++++++++++---------- |
9 | 1 file changed, 29 insertions(+), 10 deletions(-) | 10 | 1 file changed, 29 insertions(+), 10 deletions(-) |
10 | 11 | ||
11 | diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4 | 12 | diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4 |
12 | index 0c0e3c5b..17590e96 100644 | 13 | index bf18866..8097523 100644 |
13 | --- a/lib/autotest/general.m4 | 14 | --- a/lib/autotest/general.m4 |
14 | +++ b/lib/autotest/general.m4 | 15 | +++ b/lib/autotest/general.m4 |
15 | @@ -412,6 +412,9 @@ at_recheck= | 16 | @@ -427,6 +427,9 @@ at_recheck= |
16 | # Whether a write failure occurred | 17 | # Whether a write failure occurred |
17 | at_write_fail=0 | 18 | at_write_fail=0 |
18 | 19 | ||
@@ -22,7 +23,7 @@ index 0c0e3c5b..17590e96 100644 | |||
22 | # The directory we run the suite in. Default to . if no -C option. | 23 | # The directory we run the suite in. Default to . if no -C option. |
23 | at_dir=`pwd` | 24 | at_dir=`pwd` |
24 | # An absolute reference to this testsuite script. | 25 | # An absolute reference to this testsuite script. |
25 | @@ -525,6 +528,10 @@ do | 26 | @@ -540,6 +543,10 @@ do |
26 | at_check_filter_trace=at_fn_filter_trace | 27 | at_check_filter_trace=at_fn_filter_trace |
27 | ;; | 28 | ;; |
28 | 29 | ||
@@ -33,7 +34,7 @@ index 0c0e3c5b..17590e96 100644 | |||
33 | [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]]) | 34 | [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]]) |
34 | at_fn_validate_ranges at_option | 35 | at_fn_validate_ranges at_option |
35 | AS_VAR_APPEND([at_groups], ["$at_option$as_nl"]) | 36 | AS_VAR_APPEND([at_groups], ["$at_option$as_nl"]) |
36 | @@ -713,10 +720,10 @@ m4_divert_push([HELP_MODES])dnl | 37 | @@ -728,10 +735,10 @@ m4_divert_push([HELP_MODES])dnl |
37 | cat <<_ATEOF || at_write_fail=1 | 38 | cat <<_ATEOF || at_write_fail=1 |
38 | 39 | ||
39 | Operation modes: | 40 | Operation modes: |
@@ -48,7 +49,7 @@ index 0c0e3c5b..17590e96 100644 | |||
48 | _ATEOF | 49 | _ATEOF |
49 | m4_divert_pop([HELP_MODES])dnl | 50 | m4_divert_pop([HELP_MODES])dnl |
50 | m4_wrap([m4_divert_push([HELP_TUNING_BEGIN])dnl | 51 | m4_wrap([m4_divert_push([HELP_TUNING_BEGIN])dnl |
51 | @@ -742,6 +749,7 @@ Execution tuning: | 52 | @@ -757,6 +764,7 @@ Execution tuning: |
52 | -d, --debug inhibit clean up and top-level logging | 53 | -d, --debug inhibit clean up and top-level logging |
53 | [ default for debugging scripts] | 54 | [ default for debugging scripts] |
54 | -x, --trace enable tests shell tracing | 55 | -x, --trace enable tests shell tracing |
@@ -56,7 +57,7 @@ index 0c0e3c5b..17590e96 100644 | |||
56 | _ATEOF | 57 | _ATEOF |
57 | m4_divert_pop([HELP_TUNING_BEGIN])])dnl | 58 | m4_divert_pop([HELP_TUNING_BEGIN])])dnl |
58 | m4_divert_push([HELP_END])dnl | 59 | m4_divert_push([HELP_END])dnl |
59 | @@ -1129,7 +1137,9 @@ at_fn_group_banner () | 60 | @@ -1139,7 +1147,9 @@ at_fn_group_banner () |
60 | [*]) at_desc_line="$[1]: " ;; | 61 | [*]) at_desc_line="$[1]: " ;; |
61 | esac | 62 | esac |
62 | AS_VAR_APPEND([at_desc_line], ["$[3]$[4]"]) | 63 | AS_VAR_APPEND([at_desc_line], ["$[3]$[4]"]) |
@@ -67,7 +68,7 @@ index 0c0e3c5b..17590e96 100644 | |||
67 | echo "# -*- compilation -*-" >> "$at_group_log" | 68 | echo "# -*- compilation -*-" >> "$at_group_log" |
68 | } | 69 | } |
69 | 70 | ||
70 | @@ -1155,42 +1165,51 @@ _ATEOF | 71 | @@ -1165,42 +1175,51 @@ _ATEOF |
71 | case $at_xfail:$at_status in | 72 | case $at_xfail:$at_status in |
72 | yes:0) | 73 | yes:0) |
73 | at_msg="UNEXPECTED PASS" | 74 | at_msg="UNEXPECTED PASS" |
@@ -124,6 +125,3 @@ index 0c0e3c5b..17590e96 100644 | |||
124 | fi | 125 | fi |
125 | at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg" | 126 | at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg" |
126 | case $at_status in | 127 | case $at_status in |
127 | -- | ||
128 | 2.25.1 | ||
129 | |||