diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-12-13 14:41:44 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-12-13 15:19:36 +1100 |
| commit | 0913eb7abcfdbd42927916b272b55363b81e03e4 (patch) | |
| tree | 70908ffb496cfbfdbe6a1d0d4b022174bd38363e | |
| parent | 6e975e1d0fdafdf6cf534da7742b57a538c4fa28 (diff) | |
| download | skiboot-0913eb7abcfdbd42927916b272b55363b81e03e4.zip skiboot-0913eb7abcfdbd42927916b272b55363b81e03e4.tar.gz skiboot-0913eb7abcfdbd42927916b272b55363b81e03e4.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>
(cherry picked from commit 41f51c834a1be508ca2e7446fe8fa6abc3af473c)
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -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 c3bbc61..05951ae 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() { |