[Skiboot] [PATCH] external/test: make stripping out version number more robust
Stewart Smith
stewart at linux.vnet.ibm.com
Wed Dec 13 15:19:08 AEDT 2017
For some bizarre reason, Travis started failing on this
substitution when there'd been zero code changes in this
area... This at least papers over whatever the problem is
for the time being.
Signed-off-by: Stewart Smith <stewart at linux.vnet.ibm.com>
---
external/test/test.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/external/test/test.sh b/external/test/test.sh
index c3bbc61c197d..05951aeaa794 100755
--- a/external/test/test.sh
+++ b/external/test/test.sh
@@ -36,8 +36,8 @@ pass_test() {
strip_version_from_result() {
VERSION=$(./make_version.sh $1)
- sed -i "s/${VERSION}/VERSION/" $STDERR_OUT
- sed -i "s/${VERSION}/VERSION/" $STDOUT_OUT
+ sed -i "s/${VERSION}/VERSION/;s/^Open-Power \(.*\) tool v.*/Open-Power \\1 tool VERSION/" $STDERR_OUT
+ sed -i "s/${VERSION}/VERSION/;s/^Open-Power \(.*\) tool v.*/Open-Power \\1 tool VERSION/" $STDOUT_OUT
}
diff_with_result() {
--
2.14.3
More information about the Skiboot
mailing list