aboutsummaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.vnet.ibm.com>2017-12-13 14:41:44 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2017-12-13 15:19:27 +1100
commit41f51c834a1be508ca2e7446fe8fa6abc3af473c (patch)
tree3f1adf628d5f9968a05b8a170bf3f63c0571b9ca /external
parent84febad7c5f947d744ef656f4b478d8b1df51471 (diff)
downloadskiboot-41f51c834a1be508ca2e7446fe8fa6abc3af473c.zip
skiboot-41f51c834a1be508ca2e7446fe8fa6abc3af473c.tar.gz
skiboot-41f51c834a1be508ca2e7446fe8fa6abc3af473c.tar.bz2
external/test: make stripping out version number more robust
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@linux.vnet.ibm.com>
Diffstat (limited to 'external')
-rwxr-xr-xexternal/test/test.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/external/test/test.sh b/external/test/test.sh
index c79a486..cb9b686 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/" $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() {