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