diff options
author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-05-04 14:48:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-04 14:48:49 +0100 |
commit | 65c6fbddeb313732d65744c29721e50eaf0de889 (patch) | |
tree | efe09ceeda9873d1f6b6a83284da045b801d1dc9 | |
parent | 5c894efd0ee67bf911b9c3b5428a61ddc58819de (diff) |
Fix newlines between white/blacklist test names in buildkite annotations (#1003)
-rwxr-xr-x | show-expected-fail-tests.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/show-expected-fail-tests.sh b/show-expected-fail-tests.sh index 0a4c7be8..320d4ebd 100755 --- a/show-expected-fail-tests.sh +++ b/show-expected-fail-tests.sh @@ -80,8 +80,8 @@ done <<< "${passed_but_expected_fail}" # TODO: Check that the same test doesn't appear twice in the whitelist|blacklist # Trim test output strings -tests_to_add=$(echo -e $tests_to_add | xargs -d '\n') -already_in_whitelist=$(echo -e $already_in_whitelist | xargs -d '\n') +tests_to_add=$(IFS=$'\n' echo "${tests_to_add[*]%%'\n'}") +already_in_whitelist=$(IFS=$'\n' echo "${already_in_whitelist[*]%%'\n'}") # Format output with markdown for buildkite annotation rendering purposes if [ -n "${tests_to_add}" ] && [ -n "${already_in_whitelist}" ]; then @@ -91,14 +91,14 @@ fi 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 "\`\`\`" - echo -e "${tests_to_add}" + echo -e "${tests_to_add}" echo "\`\`\`" fi if [ -n "${already_in_whitelist}" ]; then echo "**WARN**: Tests in the whitelist still marked as **expected fail**:" echo "\`\`\`" - echo -e "${already_in_whitelist}" + echo -e "${already_in_whitelist}" echo "\`\`\`" fi |