Fix newlines between white/blacklist test names in buildkite annotations (#1003)

main
Andrew Morgan 2020-05-04 14:48:49 +01:00 committed by GitHub
parent 5c894efd0e
commit 65c6fbddeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -80,8 +80,8 @@ done <<< "${passed_but_expected_fail}"
# TODO: Check that the same test doesn't appear twice in the whitelist|blacklist # TODO: Check that the same test doesn't appear twice in the whitelist|blacklist
# Trim test output strings # Trim test output strings
tests_to_add=$(echo -e $tests_to_add | xargs -d '\n') tests_to_add=$(IFS=$'\n' echo "${tests_to_add[*]%%'\n'}")
already_in_whitelist=$(echo -e $already_in_whitelist | xargs -d '\n') already_in_whitelist=$(IFS=$'\n' echo "${already_in_whitelist[*]%%'\n'}")
# Format output with markdown for buildkite annotation rendering purposes # Format output with markdown for buildkite annotation rendering purposes
if [ -n "${tests_to_add}" ] && [ -n "${already_in_whitelist}" ]; then if [ -n "${tests_to_add}" ] && [ -n "${already_in_whitelist}" ]; then
@ -91,14 +91,14 @@ fi
if [ -n "${tests_to_add}" ]; then if [ -n "${tests_to_add}" ]; then
echo "**ERROR**: The following tests passed but are not present in \`$2\`. Please append them to the file:" echo "**ERROR**: The following tests passed but are not present in \`$2\`. Please append them to the file:"
echo "\`\`\`" echo "\`\`\`"
echo -e "${tests_to_add}" echo -e "${tests_to_add}"
echo "\`\`\`" echo "\`\`\`"
fi fi
if [ -n "${already_in_whitelist}" ]; then if [ -n "${already_in_whitelist}" ]; then
echo "**WARN**: Tests in the whitelist still marked as **expected fail**:" echo "**WARN**: Tests in the whitelist still marked as **expected fail**:"
echo "\`\`\`" echo "\`\`\`"
echo -e "${already_in_whitelist}" echo -e "${already_in_whitelist}"
echo "\`\`\`" echo "\`\`\`"
fi fi