Skip to content

K
k3s
Commit b650e481 authored by Jeff Lowdermilk's avatar Jeff Lowdermilk
Browse files
Options

Merge pull request #5160 from brendandburns/service

Fix coverage testing to work on OS X, where xargs is different.
parents f4e5e011 2b7ae7fc
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
hack/test-go.sh
View file @ b650e481
...@@ -181,8 +181,9 @@ combined_cover_profile="${cover_report_dir}/combined-coverage.out" ...@@ -181,8 +181,9 @@ combined_cover_profile="${cover_report_dir}/combined-coverage.out"
# Include all coverage reach data in the combined profile, but exclude the # Include all coverage reach data in the combined profile, but exclude the
# 'mode' lines, as there should be only one. # 'mode' lines, as there should be only one.
find "${cover_report_dir}" -name "${cover_profile}" | for x in `find "${cover_report_dir}" -name "${cover_profile}"`; do
xargs -r grep -h -v "^mode:" || true cat $x | grep -h -v "^mode:" || true
done
} >"${combined_cover_profile}" } >"${combined_cover_profile}"
coverage_html_file="${cover_report_dir}/combined-coverage.html" coverage_html_file="${cover_report_dir}/combined-coverage.html"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment