diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-12-13 18:09:53 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-12-15 12:15:58 +1100 |
| commit | 7a2610a145a85cc473e4075298b72e276a1ce684 (patch) | |
| tree | e64a361b1a5953d16a1f1a27eb130bca9e15dadd /external | |
| parent | 70f14f4dd86eb0aa89806b5a30f4cf072f890143 (diff) | |
| download | blackbird-skiboot-7a2610a145a85cc473e4075298b72e276a1ce684.tar.gz blackbird-skiboot-7a2610a145a85cc473e4075298b72e276a1ce684.zip | |
external/test/test.sh: fix VERSION substitution when no tags
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@linux.vnet.ibm.com>
Diffstat (limited to 'external')
| -rwxr-xr-x | external/test/test.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/test/test.sh b/external/test/test.sh index cb9b6865..fd596b19 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() { |
