[Skiboot] [PATCH] external/test/test.sh: fix VERSION substitution when no tags
Stewart Smith
stewart at linux.vnet.ibm.com
Fri Dec 15 12:21:20 AEDT 2017
i.e. we get a hash rather than a version number
This seems to be occuring in Travis if it doesn't pull a tag.
Fixes: 41f51c834a1be508ca2e7446fe8fa6abc3af473c
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 cb9b68658dd4..fd596b19206e 100755
--- a/external/test/test.sh
+++ b/external/test/test.sh
@@ -40,8 +40,8 @@ pass_test() {
strip_version_from_result() {
VERSION=$(./make_version.sh $1)
- 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
+ sed -i "s/${VERSION}/VERSION/;s/^Open-Power \(.*\) tool .*/Open-Power \\1 tool VERSION/" $STDERR_OUT
+ sed -i "s/${VERSION}/VERSION/;s/^Open-Power \(.*\) tool .*/Open-Power \\1 tool VERSION/" $STDOUT_OUT
}
diff_with_result() {
--
2.14.3
More information about the Skiboot
mailing list